Index: chrome/test/plugin/plugin_test.cpp |
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp |
index 850c6216f60d777ec5cd8d7b2814c28873c23444..31b8d5375e1f083e8aa067af7f7b171b7cadab11 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" |
@@ -139,7 +140,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 { |
@@ -163,7 +165,7 @@ TEST_F(ClickToPlayPluginTest, Flash) { |
ASSERT_TRUE(tab->LoadBlockedPlugins()); |
- WaitForFinish(action_max_timeout_ms(), true); |
+ WaitForFinish(TestTimeouts::action_max_timeout_ms(), true); |
} |
TEST_F(ClickToPlayPluginTest, FlashDocument) { |
@@ -184,13 +186,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) |
@@ -199,26 +201,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) |
@@ -227,16 +230,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 |