Observe plug-in blacklist changes in user preferences instead of local state.

Previously, we would read the plug-in blacklist from user prefs at startup, but watch for changes (only!) in local state, which just seems wrong.

BUG=80025,45856
TEST=none

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

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

1 files changed, 1 insertions, 8 deletions

diff --git a/content/browser/plugin_service_unittest.cc b/content/browser/plugin_service_unittest.cc
index 283f86d..4d9f420 100644
--- a/content/browser/plugin_service_unittest.cc
+++ b/content/browser/plugin_service_unittest.cc
@@ -1,11 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "content/browser/plugin_service.h"
 
-#include "base/auto_reset.h"
-#include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -19,12 +17,8 @@ class PluginServiceTest : public testing::Test {
         file_thread_(BrowserThread::FILE, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_) {}
 
-  virtual ~PluginServiceTest() {}
 
   virtual void SetUp() {
-    profile_.reset(new TestingProfile());
-
-    PluginService::InitGlobalInstance(profile_.get());
     plugin_service_ = PluginService::GetInstance();
     ASSERT_TRUE(plugin_service_);
   }
@@ -37,7 +31,6 @@ class PluginServiceTest : public testing::Test {
   BrowserThread ui_thread_;
   BrowserThread file_thread_;
   BrowserThread io_thread_;
-  scoped_ptr<TestingProfile> profile_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginServiceTest);
 };