Remove action_max_timeout_ms and fix all the callers.

chrome/browser/tab_restore_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/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 74 matching lines @@
     }
 
     // Get a handle to the restored tab.
     ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
     ASSERT_GT(tab_count, expected_tabstrip_index);
     scoped_refptr<TabProxy> restored_tab_proxy(
         browser_proxy->GetTab(expected_tabstrip_index));
     ASSERT_TRUE(restored_tab_proxy.get());
     // Wait for the restored tab to finish loading.
     ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(
-        action_max_timeout_ms()));
+        TestTimeouts::action_max_timeout_ms()));
 
     // Ensure that the tab and window are active.
     CheckActiveWindow(browser_proxy.get());
     EXPECT_EQ(expected_tabstrip_index,
         GetActiveTabIndex(expected_window_index));
   }
 
   // Adds tabs to the given browser, all navigated to url1_. Returns
   // the final number of tabs.
   int AddSomeTabs(BrowserProxy* browser, int how_many) {
@@ skipping 566 matching lines @@
   ASSERT_TRUE(tab->WaitForTabToBeRestored(TestTimeouts::action_timeout_ms()));
   GURL url;
   ASSERT_TRUE(tab->GetCurrentURL(&url));
   ASSERT_EQ(http_url, url);
 
   // Go back, and see if content is as expected.
   ASSERT_TRUE(tab->GoBack());
   EXPECT_TRUE(tab->FindInPage(std::wstring(L"webkit"), FWD, IGNORE_CASE, false,
                               NULL));
 }