get rid of old options pages

chrome/browser/ui/webui/options2/options_ui2_uitest.cc

Index: chrome/browser/ui/webui/options2/options_ui2_uitest.cc
diff --git a/chrome/browser/ui/webui/options2/options_ui2_uitest.cc b/chrome/browser/ui/webui/options2/options_ui2_uitest.cc
index afebd61a4aa7b12cc6290d89a3da3c358e23512b..b6796e6f0eec14c6f5553303ae5bbd05d91e54ab 100644
--- a/chrome/browser/ui/webui/options2/options_ui2_uitest.cc
+++ b/chrome/browser/ui/webui/options2/options_ui2_uitest.cc
@@ -29,7 +29,7 @@ void OptionsUITest::VerifyNavbar(scoped_refptr<TabProxy> tab) {
   bool navbar_exist = false;
   EXPECT_TRUE(tab->ExecuteAndExtractBool(L"",
       L"domAutomationController.send("
-      L"!!document.getElementById('navbar'))", &navbar_exist));
+      L"!!document.getElementById('navigation'))", &navbar_exist));
   EXPECT_EQ(true, navbar_exist);
 }
 
@@ -40,19 +40,6 @@ void OptionsUITest::VerifyTitle(scoped_refptr<TabProxy> tab) {
   EXPECT_NE(WideToUTF16Hack(title).find(expected_title), string16::npos);
 }
 

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

TODO(estade): Rewrite for uberpage?

-void OptionsUITest::VerifySections(scoped_refptr<TabProxy> tab) {
-#if defined(OS_CHROMEOS)
-  const int kExpectedSections = 1 + 7;
-#else
-  const int kExpectedSections = 1 + 4;
-#endif
-  int num_of_sections = 0;
-  EXPECT_TRUE(tab->ExecuteAndExtractInt(L"",
-      L"domAutomationController.send("
-      L"document.getElementById('navbar').children.length)", &num_of_sections));
-  EXPECT_EQ(kExpectedSections, num_of_sections);
-}
-
 TEST_F(OptionsUITest, LoadOptionsByURL) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
@@ -63,7 +50,6 @@ TEST_F(OptionsUITest, LoadOptionsByURL) {
   NavigateToSettings(tab);
   VerifyTitle(tab);
   VerifyNavbar(tab);
-  VerifySections(tab);
 }
 
 }  // namespace options2