Remove action_max_timeout_ms and fix all the callers.

chrome/test/plugin/plugin_test.cpp

 // 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.
 
 // Tests for the top plugins to catch regressions in our plugin host code, as
 // well as in the out of process code.  Currently this tests:
 //  Flash
 //  Real
 //  QuickTime
 //  Windows Media Player
@@ skipping 13 matching lines @@
 #include <stdlib.h>
 #include <string.h>
 #include <memory.h>
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/browser/plugin_download_helper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/host_resolver.h"
 #include "net/base/net_util.h"
@@ skipping 91 matching lines @@
   // Flash plugin in the future?
   std::string kFlashQuery =
 #if defined(OS_WIN)
       "npswf32.dll"
 #elif defined(OS_MACOSX)
       "Flash Player.plugin"
 #elif defined(OS_POSIX)
       "libflashplayer.so"
 #endif
       ;
-  TestPlugin("flash.html?" + kFlashQuery, action_max_timeout_ms(), false);
+  TestPlugin("flash.html?" + kFlashQuery,
+             TestTimeouts::action_max_timeout_ms(), false);
 }
 
 class ClickToPlayPluginTest : public PluginTest {
  public:
   ClickToPlayPluginTest() {
     dom_automation_enabled_ = true;
   }
 };
 
 // http://crbug.com/68303
 #if defined(OS_MACOSX)
 TEST_F(ClickToPlayPluginTest, DISABLED_Flash) {
 #else
 TEST_F(ClickToPlayPluginTest, Flash) {
 #endif
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
                                                 CONTENT_SETTING_BLOCK));
 
   GURL url = GetTestUrl("flash-clicktoplay.html", true);
   NavigateToURL(url);
 
   scoped_refptr<TabProxy> tab(browser->GetTab(0));
   ASSERT_TRUE(tab.get());
 
   ASSERT_TRUE(tab->LoadBlockedPlugins());
 
-  WaitForFinish(action_max_timeout_ms(), true);
+  WaitForFinish(TestTimeouts::action_max_timeout_ms(), true);
 }
 
 // http://crbug.com/68303
 #if defined(OS_MACOSX)
 TEST_F(ClickToPlayPluginTest, DISABLED_FlashDocument) {
 #else
 TEST_F(ClickToPlayPluginTest, FlashDocument) {
 #endif
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
                                                 CONTENT_SETTING_BLOCK));
 
   scoped_refptr<TabProxy> tab(browser->GetTab(0));
   ASSERT_TRUE(tab.get());
   GURL url = GetTestUrl("js-invoker.swf?callback=done", true);
   NavigateToURL(url);
 
   // Inject the callback function into the HTML page generated by the browser.
   ASSERT_TRUE(tab->ExecuteJavaScript("window.done = function() {"
                                      "  window.location = \"done.html\";"
                                      "}"));
 
   ASSERT_TRUE(tab->LoadBlockedPlugins());
 
-  WaitForFinish(action_max_timeout_ms(), true);
+  WaitForFinish(TestTimeouts::action_max_timeout_ms(), true);
 }
 
 #if defined(OS_WIN)
 // Windows only test
 TEST_F(PluginTest, DISABLED_FlashSecurity) {
-  TestPlugin("flash.html", action_max_timeout_ms(), false);
+  TestPlugin("flash.html", TestTimeouts::action_max_timeout_ms(), false);
 }
 #endif  // defined(OS_WIN)
 
 #if defined(OS_WIN)
 // TODO(port) Port the following tests to platforms that have the required
 // plugins.
 // Flaky: http://crbug.com/55915
 TEST_F(PluginTest, FLAKY_Quicktime) {
-  TestPlugin("quicktime.html", action_max_timeout_ms(), false);
+  TestPlugin("quicktime.html", TestTimeouts::action_max_timeout_ms(), false);
 }
 
 // Disabled - http://crbug.com/44662
 TEST_F(PluginTest, DISABLED_MediaPlayerNew) {
-  TestPlugin("wmp_new.html", action_max_timeout_ms(), false);
+  TestPlugin("wmp_new.html", TestTimeouts::action_max_timeout_ms(), false);
 }
 
 // http://crbug.com/4809
 TEST_F(PluginTest, DISABLED_MediaPlayerOld) {
-  TestPlugin("wmp_old.html", action_max_timeout_ms(), false);
+  TestPlugin("wmp_old.html", TestTimeouts::action_max_timeout_ms(), false);
 }
 
 // Disabled - http://crbug.com/44673
 TEST_F(PluginTest, DISABLED_Real) {
-  TestPlugin("real.html", action_max_timeout_ms(), false);
+  TestPlugin("real.html", TestTimeouts::action_max_timeout_ms(), false);
 }
 
 TEST_F(PluginTest, FlashOctetStream) {
-  TestPlugin("flash-octet-stream.html", action_max_timeout_ms(), false);
+  TestPlugin("flash-octet-stream.html",
+             TestTimeouts::action_max_timeout_ms(), false);
 }
 
 #if defined(OS_WIN)
 // http://crbug.com/53926
 TEST_F(PluginTest, FLAKY_FlashLayoutWhilePainting) {
 #else
 TEST_F(PluginTest, FlashLayoutWhilePainting) {
 #endif
-  TestPlugin("flash-layout-while-painting.html", action_max_timeout_ms(), true);
+  TestPlugin("flash-layout-while-painting.html",
+             TestTimeouts::action_max_timeout_ms(), true);
 }
 
 // http://crbug.com/8690
 TEST_F(PluginTest, DISABLED_Java) {
-  TestPlugin("Java.html", action_max_timeout_ms(), false);
+  TestPlugin("Java.html", TestTimeouts::action_max_timeout_ms(), false);
 }
 
 TEST_F(PluginTest, Silverlight) {
-  TestPlugin("silverlight.html", action_max_timeout_ms(), false);
+  TestPlugin("silverlight.html", TestTimeouts::action_max_timeout_ms(), false);
 }
 
 // This class provides functionality to test the plugin installer download
 // file functionality.
 class PluginInstallerDownloadTest
     : public PluginDownloadUrlHelper::DownloadDelegate,
       public testing::Test {
  public:
   // This class provides HTTP request context information for the downloads.
   class UploadRequestContext : public net::URLRequestContext {
@@ skipping 98 matching lines @@
 TEST_F(PluginInstallerDownloadTest, PluginInstallerDownloadPathTest) {
   MessageLoop loop(MessageLoop::TYPE_IO);
   Start();
   loop.Run();
 
   EXPECT_TRUE(success());
   EXPECT_TRUE(initial_download_path().BaseName().value() ==
               final_download_path().BaseName().value());
 }
 #endif  // defined(OS_WIN)