Remove plugin_list.h includes from chrome tests in preparation for moving webkit/plugins to content…

chrome/browser/plugins/plugin_prefs_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/plugins/plugin_prefs.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/plugins/npapi/mock_plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using content::BrowserThread;
 using content::PluginService;
 
 namespace {
 
 void CanEnablePluginCallback(const base::Closure& quit_closure,
                              bool expected_can_change,
                              bool did_change) {
@@ skipping 10 matching lines @@
   path = path.Append(chrome::kPepperFlashPluginFilename);
   return path;
 }
 
 base::FilePath GetBundledPepperFlashPath() {
   base::FilePath path;
   EXPECT_TRUE(PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &path));
   return path;
 }
 
+void GotPlugins(const base::Closure& quit_closure,
+                const std::vector<webkit::WebPluginInfo>& plugins) {
+  quit_closure.Run();
+}
+
 }  // namespace
 
 class PluginPrefsTest : public ::testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
     plugin_prefs_ = new PluginPrefs();
   }
 
   void SetPolicyEnforcedPluginPatterns(
       const std::set<string16>& disabled,
@@ skipping 116 matching lines @@
             plugin_prefs_->PolicyStatusForPlugin(kGoogleMars));
   EXPECT_EQ(PluginPrefs::POLICY_DISABLED,
             plugin_prefs_->PolicyStatusForPlugin(k42));
 }
 
 TEST_F(PluginPrefsTest, UnifiedPepperFlashState) {
   base::ShadowingAtExitManager at_exit_manager_;  // Destroys the PluginService.
 
   base::MessageLoop message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
-  webkit::npapi::MockPluginList plugin_list;
-  PluginService::GetInstance()->SetPluginListForTesting(&plugin_list);
   PluginService::GetInstance()->Init();
+  PluginService::GetInstance()->DisablePluginsDiscoveryForTesting();
 
   string16 component_updated_plugin_name(
       ASCIIToUTF16("Component-updated Pepper Flash"));
   webkit::WebPluginInfo component_updated_plugin_1(
       component_updated_plugin_name,
       GetComponentUpdatedPepperFlashPath(FILE_PATH_LITERAL("11.3.31.227")),
       ASCIIToUTF16("11.3.31.227"),
       ASCIIToUTF16(""));
   webkit::WebPluginInfo component_updated_plugin_2(
       component_updated_plugin_name,
       GetComponentUpdatedPepperFlashPath(FILE_PATH_LITERAL("11.3.31.228")),
       ASCIIToUTF16("11.3.31.228"),
       ASCIIToUTF16(""));
   webkit::WebPluginInfo bundled_plugin(ASCIIToUTF16("Pepper Flash"),
                                        GetBundledPepperFlashPath(),
                                        ASCIIToUTF16("11.3.31.229"),
                                        ASCIIToUTF16(""));
 
-  plugin_list.AddPluginToLoad(component_updated_plugin_1);
-  plugin_list.AddPluginToLoad(component_updated_plugin_2);
-  plugin_list.AddPluginToLoad(bundled_plugin);
+  PluginService::GetInstance()->RegisterInternalPlugin(
+      component_updated_plugin_1, false);
+  PluginService::GetInstance()->RegisterInternalPlugin(
+      component_updated_plugin_2, false);
+  PluginService::GetInstance()->RegisterInternalPlugin(bundled_plugin, false);
+
+  scoped_refptr<content::MessageLoopRunner> runner =

[scottmg, 2013/07/18 00:33:09]

was this previously a bug?

[jam, 2013/07/18 00:36:35]

When MockPlugin was used, plugins were available instantly because of how it was
used by PluginService. After getting rid of it, a GetPlugins call is needed.

+      new content::MessageLoopRunner;
+  PluginService::GetInstance()->GetPlugins(
+      base::Bind(&GotPlugins, runner->QuitClosure()));
+  runner->Run();
 
   // Set the state of any of the three plugins will affect the others.
   EnablePluginSynchronously(true, component_updated_plugin_1.path, true);
   EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1));
   EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));
   EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(bundled_plugin));
 
   EnablePluginSynchronously(false, bundled_plugin.path, true);
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1));
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));
@@ skipping 23 matching lines @@
   // they are not restricted by any policy.
   EnablePluginSynchronously(true, component_updated_plugin_1.path, false);
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1));
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(bundled_plugin));
 
   EnablePluginSynchronously(true, bundled_plugin.path, true);
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1));
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));
   EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(bundled_plugin));
-
-  PluginService::GetInstance()->SetPluginListForTesting(NULL);
 }