Remove action_max_timeout_ms and fix all the callers.

chrome/browser/dom_ui/new_tab_ui_uitest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/sync/signin_manager.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
@@ skipping 25 matching lines @@
   ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
 
   scoped_refptr<TabProxy> tab = window->GetActiveTab();
   ASSERT_TRUE(tab.get());
 
   // TopSites should return at least 3 non-filler pages.
   // 8 - 3 = max 5 filler pages.
   ASSERT_TRUE(WaitUntilJavaScriptCondition(tab, L"",
       L"window.domAutomationController.send("
       L"document.getElementsByClassName('filler').length <= 5)",
-      action_max_timeout_ms()));
+      TestTimeouts::action_max_timeout_ms()));
 }
 
 TEST_F(NewTabUITest, NTPHasLoginName) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   ASSERT_TRUE(window->SetStringPreference(prefs::kGoogleServicesUsername,
                                           "user@gmail.com"));
   // Bring up a new tab page.
   ASSERT_TRUE(window->RunCommand(IDC_NEW_TAB));
   int load_time;
   ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
 
   scoped_refptr<TabProxy> tab = window->GetActiveTab();
   ASSERT_TRUE(tab.get());
 
   std::wstring displayed_username;
   // The login span should be eventually populated and have the
   // correct value.
   ASSERT_TRUE(WaitUntilJavaScriptCondition(tab, L"",
       L"window.domAutomationController.send("
       L"document.getElementById('login-username').innerText.length > 0)",
-      action_max_timeout_ms()));
+      TestTimeouts::action_max_timeout_ms()));
 
   ASSERT_TRUE(tab->ExecuteAndExtractString(
       L"",
       L"window.domAutomationController.send("
       L"document.getElementById('login-username').innerText)",
       &displayed_username));
 
   EXPECT_EQ(L"user@gmail.com", displayed_username);
 }
 
@@ skipping 58 matching lines @@
   ASSERT_EQ(0, prefs->GetInteger(prefs::kNTPPrefVersion));
 
   bool migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_TRUE(migrated);
   ASSERT_EQ(NewTabUI::current_pref_version(),
             prefs->GetInteger(prefs::kNTPPrefVersion));
 
   migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_FALSE(migrated);
 }