Remove action_max_timeout_ms and fix all the callers.

chrome/test/plugin/plugin_test.cpp

Index: chrome/test/plugin/plugin_test.cpp
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 3ff5e214fcd1b0cdb677a7a152b2ab05c37fed2e..3343ec9383152c6900464af70af0cf8dc9d7dd5a 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -31,6 +31,7 @@
 #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"
@@ -142,7 +143,8 @@ TEST_F(PluginTest, Flash) {
       "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 {
@@ -171,7 +173,7 @@ TEST_F(ClickToPlayPluginTest, Flash) {
 
   ASSERT_TRUE(tab->LoadBlockedPlugins());
 
-  WaitForFinish(action_max_timeout_ms(), true);
+  WaitForFinish(TestTimeouts::action_max_timeout_ms(), true);
 }
 
 // http://crbug.com/68303
@@ -197,13 +199,13 @@ TEST_F(ClickToPlayPluginTest, FlashDocument) {
 
   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)
 
@@ -212,26 +214,27 @@ TEST_F(PluginTest, DISABLED_FlashSecurity) {
 // 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)
@@ -240,16 +243,17 @@ 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