3 files changed, 1 insertions, 24 deletions
diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc
index 191f7ae..44a5808 100644
--- a/content/browser/plugin_service.cc
+++ b/content/browser/plugin_service.cc
@@ -15,8 +15,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/plugin_updater.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/default_plugin.h"
@@ -72,15 +70,6 @@ class PluginDirWatcherDelegate : public FilePathWatcher::Delegate {
 #endif
 
 // static
-void PluginService::InitGlobalInstance(Profile* profile) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // We first group the plugins and then figure out which groups to
-  // enable or disable.
-  PluginUpdater::GetInstance()->UpdatePluginGroupsStateFromPrefs(profile);
-}
-
-// static
 PluginService* PluginService::GetInstance() {
   return Singleton<PluginService>::get();
 }
diff --git a/content/browser/plugin_service.h b/content/browser/plugin_service.h
index d5c5004..75a6794 100644
--- a/content/browser/plugin_service.h
+++ b/content/browser/plugin_service.h
@@ -50,7 +50,6 @@ class Message;
 class MessageLoop;
 struct PepperPluginInfo;
 class PluginDirWatcherDelegate;
-class Profile;
 class ResourceDispatcherHost;
 
 namespace net {
@@ -70,10 +69,6 @@ class PluginService
     webkit::npapi::WebPluginInfo plugin;
   };
 
-  // Initializes the global instance; should be called on startup from the main
-  // thread.
-  static void InitGlobalInstance(Profile* profile);
-
   // Returns the PluginService singleton.
   static PluginService* GetInstance();
 
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);
 };