Remove action_max_timeout_ms and fix all the callers.

chrome/browser/unload_uitest.cc

-// Copyright (c) 2006-2009 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 "app/message_box_flags.h"
 #include "base/file_util.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_unittest.h"
 #include "views/event.h"
 
@@ skipping 80 matching lines @@
     if (strcmp(test_info->name(),
         "BrowserCloseTabWhenOtherTabHasListener") == 0) {
       launch_arguments_.AppendSwitch(switches::kDisablePopupBlocking);
     }
 
     UITest::SetUp();
   }
 
   void WaitForBrowserClosed() {
     const int kCheckDelayMs = 100;
-    for (int max_wait_time = action_max_timeout_ms();
+    for (int max_wait_time = TestTimeouts::action_max_timeout_ms();
          max_wait_time > 0; max_wait_time -= kCheckDelayMs) {
       CrashAwareSleep(kCheckDelayMs);
       if (!IsBrowserRunning())
         break;
     }
 
     EXPECT_FALSE(IsBrowserRunning());
   }
 
   void CheckTitle(const std::wstring& expected_title) {
     const int kCheckDelayMs = 100;
-    for (int max_wait_time = action_max_timeout_ms();
+    for (int max_wait_time = TestTimeouts::action_max_timeout_ms();
          max_wait_time > 0; max_wait_time -= kCheckDelayMs) {
       CrashAwareSleep(kCheckDelayMs);
       if (expected_title == GetActiveTabTitle())
         break;
     }
 
     EXPECT_EQ(expected_title, GetActiveTabTitle());
   }
 
   void NavigateToDataURL(const std::string& html_content,
@@ skipping 319 matching lines @@
   ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
   scoped_refptr<TabProxy> main_tab(browser->GetActiveTab());
   ASSERT_TRUE(main_tab.get());
   std::wstring main_title;
   EXPECT_TRUE(main_tab->GetTabTitle(&main_title));
   EXPECT_EQ(std::wstring(L"only_one_unload"), main_title);
 }
 
 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs
 // and multiple windows.