Move PluginPrefs to use PluginService instead of PluginList.

chrome/browser/plugin_prefs_unittest.cc

 // 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.
 
 #include "chrome/browser/plugin_prefs.h"
 
+#include "base/at_exit.h"
+#include "base/bind.h"
+#include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "content/browser/plugin_service.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/plugins/npapi/mock_plugin_list.cc"
 #include "webkit/plugins/webplugininfo.h"
 
 using content::BrowserThread;
 
 class PluginPrefsTest : public ::testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
     plugin_prefs_ = new PluginPrefs();
   }
 
    void SetPolicyEnforcedPluginPatterns(
       const std::set<string16>& disabled,
       const std::set<string16>& disabled_exceptions,
       const std::set<string16>& enabled) {
     plugin_prefs_->SetPolicyEnforcedPluginPatterns(
         disabled, disabled_exceptions, enabled);
   }
 
  protected:
+  base::ShadowingAtExitManager at_exit_manager_;  // Destroys the PluginService.

[Bernhard Bauer, 2011/11/10 23:19:24]

You could move this down to PluginPrefsTest.DisableGlobally, to destroy the
PluginService as soon as possible.

[Robert Sesek, 2011/11/10 23:25:39]

Done.

+
   scoped_refptr<PluginPrefs> plugin_prefs_;
 };
 
 TEST_F(PluginPrefsTest, DisabledByPolicy) {
   std::set<string16> disabled_plugins;
   disabled_plugins.insert(ASCIIToUTF16("Disable this!"));
   disabled_plugins.insert(ASCIIToUTF16("*Google*"));
   SetPolicyEnforcedPluginPatterns(disabled_plugins,
                                   std::set<string16>(),
                                   std::set<string16>());
@@ skipping 88 matching lines @@
             plugin_prefs_->PolicyStatusForPlugin(kGoogleMars));
   EXPECT_EQ(PluginPrefs::POLICY_DISABLED,
             plugin_prefs_->PolicyStatusForPlugin(k42));
 }
 
 TEST_F(PluginPrefsTest, DisableGlobally) {
   MessageLoop message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
   content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop);
 
+  webkit::npapi::MockPluginList plugin_list(NULL, 0);
+  PluginService::GetInstance()->SetPluginListForTesting(&plugin_list);
+  PluginService::GetInstance()->Init();
+
   TestingBrowserProcess* browser_process =
       static_cast<TestingBrowserProcess*>(g_browser_process);
   TestingProfileManager profile_manager(browser_process);
   ASSERT_TRUE(profile_manager.SetUp());
 
   TestingProfile* profile_1 =
       profile_manager.CreateTestingProfile("Profile 1");
   PluginPrefs* plugin_prefs = PluginPrefs::GetForTestingProfile(profile_1);
   ASSERT_TRUE(plugin_prefs);
+  plugin_prefs->SetPluginListForTesting(&plugin_list);
 
   webkit::WebPluginInfo plugin(ASCIIToUTF16("Foo"),
                                FilePath(FILE_PATH_LITERAL("/path/too/foo")),
                                ASCIIToUTF16("1.0.0"),
                                ASCIIToUTF16("Foo plug-in"));
-  webkit::npapi::MockPluginList plugin_list(NULL, 0);
   plugin_list.AddPluginToLoad(plugin);
-  plugin_prefs->SetPluginListForTesting(&plugin_list);
   EXPECT_TRUE(PluginPrefs::EnablePluginGlobally(false, plugin.path));
 
+  message_loop.RunAllPending();
+
   EXPECT_FALSE(plugin_prefs->IsPluginEnabled(plugin));
 
   TestingProfile* profile_2 =
       profile_manager.CreateTestingProfile("Profile 2");
   PluginPrefs* plugin_prefs_2 = PluginPrefs::GetForTestingProfile(profile_2);
   ASSERT_TRUE(plugin_prefs);
   plugin_prefs_2->SetPluginListForTesting(&plugin_list);
   EXPECT_FALSE(plugin_prefs_2->IsPluginEnabled(plugin));
+
+  profile_manager.DeleteTestingProfile("Profile 1");
+  profile_manager.DeleteTestingProfile("Profile 2");
 }