Move PluginPrefs to use PluginService instead of PluginList.

chrome/browser/plugin_prefs.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 <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 55 matching lines @@
           profile, &PluginPrefsFactory::CreateWrapperForProfile);
   return static_cast<PluginPrefsWrapper*>(wrapper)->plugin_prefs();
 }
 
 void PluginPrefs::SetPluginListForTesting(
     webkit::npapi::PluginList* plugin_list) {
   plugin_list_ = plugin_list;
 }
 
 void PluginPrefs::EnablePluginGroup(bool enabled, const string16& group_name) {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
-    BrowserThread::PostTask(
-        BrowserThread::FILE, FROM_HERE,
-        base::Bind(&PluginPrefs::EnablePluginGroup, this, enabled, group_name));
-    return;
-  }
+  PluginService::GetInstance()->GetPluginGroups(
+        base::Bind(&PluginPrefs::EnablePluginGroupInternal,
+                   this, enabled, group_name));
+}
 
-  webkit::npapi::PluginList* plugin_list = GetPluginList();
-  std::vector<webkit::npapi::PluginGroup> groups;
-  plugin_list->GetPluginGroups(true, &groups);
-
+void PluginPrefs::EnablePluginGroupInternal(
+    bool enabled,
+    const string16& group_name,
+    const std::vector<webkit::npapi::PluginGroup>& groups) {
   base::AutoLock auto_lock(lock_);
 
   // Set the desired state for the group.
   plugin_group_state_[group_name] = enabled;
 
   // Update the state for all plug-ins in the group.
   for (size_t i = 0; i < groups.size(); ++i) {
     if (groups[i].GetGroupName() != group_name)
       continue;
     const std::vector<webkit::WebPluginInfo>& plugins =
@@ skipping 20 matching lines @@
     PolicyStatus group_status = PolicyStatusForPlugin(group->GetGroupName());
     if (enabled) {
       if (plugin_status == POLICY_DISABLED || group_status == POLICY_DISABLED)
         return false;
     } else {
       if (plugin_status == POLICY_ENABLED || group_status == POLICY_ENABLED)
         return false;
     }
   }
 
-  if (BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
-    EnablePluginInternal(enabled, path);
-  } else {
-    BrowserThread::PostTask(
-        BrowserThread::FILE, FROM_HERE,
-        base::Bind(&PluginPrefs::EnablePluginInternal, this, enabled, path));
-  }
+  PluginService::GetInstance()->GetPluginGroups(
+      base::Bind(&PluginPrefs::EnablePluginInternal, this, enabled, path));
   return true;
 }
 
-void PluginPrefs::EnablePluginInternal(bool enabled, const FilePath& path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+void PluginPrefs::EnablePluginInternal(
+    bool enabled,
+    const FilePath& path,
+    const std::vector<webkit::npapi::PluginGroup>& groups) {
   {
     // Set the desired state for the plug-in.
     base::AutoLock auto_lock(lock_);
     plugin_state_[path] = enabled;
   }
 
-  std::vector<webkit::npapi::PluginGroup> groups;
-  GetPluginList()->GetPluginGroups(true, &groups);
-
   bool found_group = false;
   for (size_t i = 0; i < groups.size(); ++i) {
     bool all_disabled = true;
     const std::vector<webkit::WebPluginInfo>& plugins =
         groups[i].web_plugin_infos();
     for (size_t j = 0; j < plugins.size(); ++j) {
       all_disabled = all_disabled && !IsPluginEnabled(plugins[j]);
       if (plugins[j].path == path) {
         found_group = true;
         DCHECK_EQ(enabled, IsPluginEnabled(plugins[j]));
@@ skipping 382 matching lines @@
   }
 }
 
 void PluginPrefs::NotifyPluginStatusChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
 }