Remove action_max_timeout_ms and fix all the callers.

chrome/browser/sessions/session_restore_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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
@@ skipping 50 matching lines @@
     int tab_count;
     ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
     ASSERT_EQ(1, tab_count);
 
     int active_tab_index;
     ASSERT_TRUE(browser_proxy->GetActiveTabIndex(&active_tab_index));
     ASSERT_EQ(0, active_tab_index);
 
     scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
-    ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));
+    ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(
+        TestTimeouts::action_max_timeout_ms()));
 
     ASSERT_TRUE(tab_proxy->GetCurrentURL(url));
   }
 
   GURL url1_;
   GURL url2_;
   GURL url3_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionRestoreUITest);
 };
 
 TEST_F(SessionRestoreUITest, Basic) {
   NavigateToURL(url1_);
   NavigateToURL(url2_);
 
   QuitBrowserAndRestore(1);
 
   // NOTE: Don't use GetActiveWindow here, when run with the screen locked
   // active windows returns NULL.
   int window_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
   scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetTab(0));
-  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));
+  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(
+      TestTimeouts::action_max_timeout_ms()));
 
   ASSERT_EQ(url2_, GetActiveTabURL());
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_proxy->GoBack());
   ASSERT_EQ(url1_, GetActiveTabURL());
 }
 
 TEST_F(SessionRestoreUITest, RestoresForwardAndBackwardNavs) {
   NavigateToURL(url1_);
   NavigateToURL(url2_);
   NavigateToURL(url3_);
 
   scoped_refptr<TabProxy> active_tab(GetActiveTab());
   ASSERT_TRUE(active_tab.get());
   ASSERT_TRUE(active_tab->GoBack());
 
   QuitBrowserAndRestore(1);
 
   // NOTE: Don't use GetActiveWindow here, when run with the screen locked
   // active windows returns NULL.
   int window_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
   scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetTab(0));
-  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));
+  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(
+      TestTimeouts::action_max_timeout_ms()));
 
   ASSERT_TRUE(GetActiveTabURL() == url2_);
   ASSERT_TRUE(tab_proxy->GoForward());
   ASSERT_TRUE(GetActiveTabURL() == url3_);
   ASSERT_TRUE(tab_proxy->GoBack());
   ASSERT_TRUE(GetActiveTabURL() == url2_);
   ASSERT_TRUE(tab_proxy->GoBack());
   ASSERT_TRUE(GetActiveTabURL() == url1_);
 }
 
@@ skipping 23 matching lines @@
   int window_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
   int tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
   ASSERT_EQ(1, tab_count);
   scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetTab(0));
   ASSERT_TRUE(tab_proxy.get());
-  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));
+  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(
+      TestTimeouts::action_max_timeout_ms()));
 
   // Check that back and forward work as expected.
   GURL url;
   ASSERT_TRUE(tab_proxy->GetCurrentURL(&url));
   ASSERT_EQ(cross_site_url, url);
 
   ASSERT_TRUE(tab_proxy->GoBack());
   ASSERT_TRUE(tab_proxy->GetCurrentURL(&url));
   ASSERT_EQ(url1_, url);
 
@@ skipping 29 matching lines @@
   int tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
   ASSERT_EQ(2, tab_count);
 
   int active_tab_index;
   ASSERT_TRUE(browser_proxy->GetActiveTabIndex(&active_tab_index));
   ASSERT_EQ(1, active_tab_index);
 
   scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
-  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));
+  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(
+      TestTimeouts::action_max_timeout_ms()));
 
   ASSERT_EQ(url2_, GetActiveTabURL());
 
   ASSERT_TRUE(browser_proxy->ActivateTab(0));
   tab_proxy = browser_proxy->GetActiveTab();
   ASSERT_TRUE(tab_proxy.get());
-  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));
+  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(
+      TestTimeouts::action_max_timeout_ms()));
 
   ASSERT_EQ(url1_, GetActiveTabURL());
 }
 
 // Creates two tabs, closes one, quits and makes sure only one tab is restored.
 TEST_F(SessionRestoreUITest, ClosedTabStaysClosed) {
   NavigateToURL(url1_);
 
   // NOTE: Don't use GetActiveWindow here, when run with the screen locked
   // active windows returns NULL.
@@ skipping 119 matching lines @@
   LaunchAnotherBrowserBlockUntilClosed(launch_arguments_);
 
   // A new window should appear;
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2));
 
   // And it shouldn't have url1_ in it.
   browser_proxy = automation()->GetBrowserWindow(1);
   ASSERT_TRUE(browser_proxy.get());
   scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetTab(0));
   ASSERT_TRUE(tab_proxy.get());
-  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));
+  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(
+      TestTimeouts::action_max_timeout_ms()));
   GURL url;
   ASSERT_TRUE(tab_proxy->GetCurrentURL(&url));
   ASSERT_TRUE(url != url1_);
 }
 
 // Launches an app window, closes tabbed browser, launches and makes sure
 // we restore the tabbed browser url.
 // Flaky: http://crbug.com/29110
 TEST_F(SessionRestoreUITest,
        FLAKY_RestoreAfterClosingTabbedBrowserWithAppAndLaunching) {
@@ skipping 86 matching lines @@
 
   // Wait for each tab to finish being restored, then make sure the process
   // count matches.
   browser_proxy = automation()->GetBrowserWindow(0);
   ASSERT_TRUE(browser_proxy.get() != NULL);
   ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
   ASSERT_EQ(expected_tab_count, tab_count);
 
   scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetTab(tab_count - 2));
   ASSERT_TRUE(tab_proxy.get() != NULL);
-  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));
+  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(
+      TestTimeouts::action_max_timeout_ms()));
   tab_proxy = browser_proxy->GetTab(tab_count - 1);
   ASSERT_TRUE(tab_proxy.get() != NULL);
-  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));
+  ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(
+      TestTimeouts::action_max_timeout_ms()));
 
   ASSERT_EQ(expected_process_count, GetBrowserProcessCount());
 }
 
 }  // namespace