Convert the PluginService interface to be an async wrapper around PluginList.

chrome/browser/plugin_exceptions_table_model.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_exceptions_table_model.h"
 
 #include "base/auto_reset.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "content/browser/plugin_service.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
+#include "webkit/plugins/npapi/plugin_group.h"
+#include "webkit/plugins/webplugininfo.h"
 
 PluginExceptionsTableModel::PluginExceptionsTableModel(
     HostContentSettingsMap* content_settings_map,
     HostContentSettingsMap* otr_content_settings_map)
     : map_(content_settings_map),
       otr_map_(otr_content_settings_map),
       updates_disabled_(false),
       observer_(NULL) {
   registrar_.Add(this, chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED,
                  Source<HostContentSettingsMap>(map_));
@@ skipping 107 matching lines @@
 
 void PluginExceptionsTableModel::ClearSettings() {
   settings_.clear();
   groups_.clear();
   row_counts_.clear();
   resources_.clear();
 }
 
 void PluginExceptionsTableModel::GetPlugins(
     std::vector<webkit::npapi::PluginGroup>* plugin_groups) {
-  webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, plugin_groups);
+  PluginService::GetInstance()->GetCachedPluginGroups(plugin_groups);
 }
 
 void PluginExceptionsTableModel::LoadSettings() {
   int group_id = 0;
   std::vector<webkit::npapi::PluginGroup> plugins;
   GetPlugins(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
     std::string plugin = plugins[i].identifier();
     HostContentSettingsMap::SettingsForOneType settings;
     map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
@@ skipping 38 matching lines @@
   }
 }
 
 void PluginExceptionsTableModel::ReloadSettings() {
   ClearSettings();
   LoadSettings();
 
   if (observer_)
     observer_->OnModelChanged();
 }