Remove obsolete test timeouts and convert callers.

chrome/browser/ui/webui/bookmarks_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 "chrome/test/ui/ui_test.h"
 
 #include "base/test/test_timeouts.h"
 #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/automation/window_proxy.h"
 
 class BookmarksUITest : public UITest {
  public:
   BookmarksUITest() {
     dom_automation_enabled_ = true;
   }
 
   bool WaitForBookmarksUI(TabProxy* tab) {
     return WaitUntilJavaScriptCondition(tab, L"",
         L"domAutomationController.send("
         L"    location.protocol == 'chrome-extension:' && "
         L"    document.readyState == 'complete')",
-        TestTimeouts::huge_test_timeout_ms());
+        TestTimeouts::large_test_timeout_ms());
   }
 
   scoped_refptr<TabProxy> GetBookmarksUITab() {
     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 117 matching lines @@
   ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER));
   ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER));
   ASSERT_TRUE(browser->GetTabCount(&tab_count));
   ASSERT_EQ(1, tab_count);
 }
 
 TEST_F(BookmarksUITest, BookmarksLoaded) {
   scoped_refptr<TabProxy> tab = GetBookmarksUITab();
   ASSERT_TRUE(tab.get());
 }