Remove obsolete test timeouts and convert callers.

chrome/browser/ui/webui/options/options_ui_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 "base/command_line.h"
 #include "base/string16.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 13 matching lines @@
  public:
   OptionsUITest() {
     dom_automation_enabled_ = true;
   }
 
   bool WaitForOptionsUI(TabProxy* tab) {
     return WaitUntilJavaScriptCondition(tab, L"",
         L"domAutomationController.send("
         L"    location.protocol == 'chrome:' && "
         L"    document.readyState == 'complete')",
-        TestTimeouts::huge_test_timeout_ms());
+        TestTimeouts::large_test_timeout_ms());
   }
 
   scoped_refptr<TabProxy> GetOptionsUITab() {
     scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
     EXPECT_TRUE(browser.get());
     if (!browser.get())
       return NULL;
     scoped_refptr<TabProxy> tab = browser->GetActiveTab();
     EXPECT_TRUE(tab.get());
     if (!tab.get())
@@ skipping 114 matching lines @@
   const int kExpectedSections = 1 + 3;
 #endif
   int num_of_sections = 0;
   ASSERT_TRUE(tab->ExecuteAndExtractInt(L"",
       L"domAutomationController.send("
       L"document.getElementById('navbar').children.length)", &num_of_sections));
   ASSERT_EQ(kExpectedSections, num_of_sections);
 }
 
 }  // namespace