get rid of old options pages

chrome/test/reliability/automated_ui_test_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/reliability/automated_ui_test_base.h"
@@ skipping 410 matching lines @@
 #if defined(OS_MACOSX)
 #define MAYBE_ShowHistory DISABLED_ShowHistory
 #else
 #define MAYBE_ShowHistory ShowHistory
 #endif
 
 TEST_F(AutomatedUITestBase, MAYBE_ShowHistory) {
   ASSERT_TRUE(ShowHistory());
   GURL url;
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
-  // TODO(csilv): Update this for uber page. http://crbug.com/111579.
-  ASSERT_EQ(GURL(chrome::kChromeUIHistoryFrameURL), url);
+  ASSERT_EQ(
+      GURL(std::string(chrome::kChromeUIUberURL) +

[Dan Beam, 2012/03/23 03:25:31]

nit: seems like this should be on same line as ASSERT_EQ( with url lined up to
end paren, but you know chrome code better than I...

+          chrome::kChromeUIHistoryHost),
+      url);
 }