get rid of old options pages

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

 // Copyright (c) 2011 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/browser/ui/webui/options2/options_ui2_uitest.h"
 
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/automation_proxy.h"
@@ skipping 11 matching lines @@
 void OptionsUITest::NavigateToSettings(scoped_refptr<TabProxy> tab) {
   const GURL& url = GURL(chrome::kChromeUISettingsURL);
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
       tab->NavigateToURLBlockUntilNavigationsComplete(url, 1)) << url.spec();
 }
 
 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);
 }
 
 void OptionsUITest::VerifyTitle(scoped_refptr<TabProxy> tab) {
   std::wstring title;
   EXPECT_TRUE(tab->GetTabTitle(&title));
   string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE);
   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());
 
   scoped_refptr<TabProxy> tab = browser->GetActiveTab();
   ASSERT_TRUE(tab.get());
 
   NavigateToSettings(tab);
   VerifyTitle(tab);
   VerifyNavbar(tab);
-  VerifySections(tab);
 }
 
 }  // namespace options2