Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3753)

Unified Diff: chrome/test/plugin/plugin_test.cpp

Issue 6365003: Tolerate out-of-date plugins for these particular tests, otherwise they... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/plugin/plugin_test.cpp
===================================================================
--- chrome/test/plugin/plugin_test.cpp (revision 71691)
+++ chrome/test/plugin/plugin_test.cpp (working copy)
@@ -75,8 +75,8 @@
}
protected:
+ virtual void SetUp() {
#if defined(OS_WIN)
- virtual void SetUp() {
const testing::TestInfo* const test_info =
testing::UnitTest::GetInstance()->current_test_info();
if (strcmp(test_info->name(), "MediaPlayerNew") == 0) {
@@ -96,10 +96,12 @@
launch_arguments_.AppendSwitchASCII(switches::kTestSandbox,
"security_tests.dll");
}
+#endif // defined(OS_WIN)
+ launch_arguments_.AppendSwitch(switches::kAllowOutdatedPlugins);
+
UITest::SetUp();
}
-#endif // defined(OS_WIN)
void TestPlugin(const std::string& test_case,
int timeout,
@@ -123,8 +125,8 @@
}
};
-// http://crbug.com/68303
-#if defined(OS_MACOSX) || defined(OS_LINUX)
+// http://crbug.com/68751
+#if defined(OS_MACOSX)
TEST_F(PluginTest, DISABLED_Flash) {
#else
TEST_F(PluginTest, Flash) {
@@ -152,7 +154,7 @@
}
};
-// http://crbug.com/68303
+// http://crbug.com/68751
#if defined(OS_MACOSX)
TEST_F(ClickToPlayPluginTest, DISABLED_Flash) {
#else
@@ -174,7 +176,7 @@
WaitForFinish(action_max_timeout_ms(), true);
}
-// http://crbug.com/68303
+// http://crbug.com/68751
Bernhard Bauer 2011/01/19 07:57:38 Drive-by: http://crbug.com/68751 is marked as fixe
#if defined(OS_MACOSX)
TEST_F(ClickToPlayPluginTest, DISABLED_FlashDocument) {
#else
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698