Move PluginPrefs to use PluginService instead of PluginList.

BUG=103788,chromium-os:22447
TEST=unit_tests --gtest_filter=PluginPrefs*

Review URL: http://codereview.chromium.org/8515021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109657 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 0 deletions

diff --git a/content/browser/plugin_loader_posix_unittest.cc b/content/browser/plugin_loader_posix_unittest.cc
index 5111f58..b9cbfac 100644
--- a/content/browser/plugin_loader_posix_unittest.cc
+++ b/content/browser/plugin_loader_posix_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/plugin_loader_posix.h"
 
+#include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
@@ -72,6 +73,10 @@ class PluginLoaderPosixTest : public testing::Test {
         plugin_loader_(new MockPluginLoaderPosix) {
   }
 
+  virtual void SetUp() OVERRIDE {
+    PluginService::GetInstance()->Init();
+  }
+
   MessageLoop* message_loop() { return &message_loop_; }
   MockPluginLoaderPosix* plugin_loader() { return plugin_loader_.get(); }
 
@@ -88,6 +93,8 @@ class PluginLoaderPosixTest : public testing::Test {
   webkit::WebPluginInfo plugin3_;
 
  private:
+  base::ShadowingAtExitManager at_exit_manager_;  // Destroys PluginService.
+
   MessageLoopForIO message_loop_;
   BrowserThreadImpl file_thread_;
   BrowserThreadImpl io_thread_;