Tolerate out-of-date plugins for these particular tests, otherwise they...

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 57 matching lines @@
       return URLRequestMockHTTPJob::GetMockUrl(plugin_path);
     }
 
     FilePath path;
     PathService::Get(chrome::DIR_TEST_DATA, &path);
     path = path.Append(kPluginPath).AppendASCII(test_case);
     return net::FilePathToFileURL(path);
   }
 
  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) {
       // The installer adds our process names to the registry key below.  Since
       // the installer might not have run on this machine, add it manually.
       base::win::RegKey regkey;
       if (regkey.Open(HKEY_LOCAL_MACHINE,
                       L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList",
                       KEY_WRITE)) {
         regkey.CreateKey(L"CHROME.EXE", KEY_READ);
       }
     } else if (strcmp(test_info->name(), "MediaPlayerOld") == 0) {
       // When testing the old WMP plugin, we need to force Chrome to not load
       // the new plugin.
       launch_arguments_.AppendSwitch(switches::kUseOldWMPPlugin);
     } else if (strcmp(test_info->name(), "FlashSecurity") == 0) {
       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,
                   bool mock_http) {
     GURL url = GetTestUrl(test_case, mock_http);
     NavigateToURL(url);
     WaitForFinish(timeout, mock_http);
   }
 
   // Waits for the test case to finish.
   void WaitForFinish(const int wait_time, bool mock_http) {
     static const char kTestCompleteCookie[] = "status";
     static const char kTestCompleteSuccess[] = "OK";
 
     GURL url = GetTestUrl("done", mock_http);
     scoped_refptr<TabProxy> tab(GetActiveTab());
 
     const std::string result =
         WaitUntilCookieNonEmpty(tab, url, kTestCompleteCookie, wait_time);
     ASSERT_EQ(kTestCompleteSuccess, result);
   }
 };
 
-// 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) {
 #endif
   // Note: This does not work with the npwrapper on 64-bit Linux. Install the
   // native 64-bit Flash to run the test.
   // TODO(thestig) Update this list if we decide to only test against internal
   // 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);
 }
 
 class ClickToPlayPluginTest : public PluginTest {
  public:
   ClickToPlayPluginTest() {
     dom_automation_enabled_ = true;
   }
 };
 
-// http://crbug.com/68303
+// http://crbug.com/68751
 #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);
 }
 
-// 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 fixed, so maybe we should
re-enable them on Mac as well?

 #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));
 
@@ skipping 173 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)