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

chrome/browser/ui/webui/plugins_ui.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/ui/webui/plugins_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
+#include "base/bind.h"
 #include "base/memory/singleton.h"
+#include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
+#include "content/browser/plugin_service.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_group.h"
 
 using webkit::npapi::PluginGroup;
 using webkit::WebPluginInfo;
 
 namespace {
 
 ChromeWebUIDataSource* CreatePluginsUIHTMLSource() {
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIPluginsHost);
 
@@ skipping 64 matching lines @@
 
   // Calback for the "getShowDetails" message.
   void HandleGetShowDetails(const ListValue* args);
 
   // NotificationObserver method overrides
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
  private:
-  // Loads the plugins on the FILE thread.
-  static void LoadPluginsOnFileThread(
-      std::vector<PluginGroup>* groups, Task* task);
-
-  // Used in conjunction with ListWrapper to avoid any memory leaks.
-  static void EnsurePluginGroupsDeleted(
-      std::vector<PluginGroup>* groups);
-
   // Call this to start getting the plugins on the UI thread.
   void LoadPlugins();
 
   // Called on the UI thread when the plugin information is ready.
-  void PluginsLoaded(const std::vector<PluginGroup>* groups);
+  void PluginsLoaded(const std::vector<PluginGroup>& groups);
 
   NotificationRegistrar registrar_;
 
-  ScopedRunnableMethodFactory<PluginsDOMHandler> get_plugins_factory_;
+  base::WeakPtrFactory<PluginsDOMHandler> weak_ptr_factory_;
 
   // This pref guards the value whether about:plugins is in the details mode or
   // not.
   BooleanPrefMember show_details_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginsDOMHandler);
 };
 
 PluginsDOMHandler::PluginsDOMHandler()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(get_plugins_factory_(this)) {
+    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED,
                  NotificationService::AllSources());
 }
 
 WebUIMessageHandler* PluginsDOMHandler::Attach(WebUI* web_ui) {
   PrefService* prefs = Profile::FromWebUI(web_ui)->GetPrefs();
 
   show_details_.Init(prefs::kPluginsShowDetails, prefs, NULL);
 
@@ skipping 69 matching lines @@
   web_ui_->CallJavascriptFunction("loadShowDetailsFromPrefs", show_details);
 }
 
 void PluginsDOMHandler::Observe(int type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED, type);
   LoadPlugins();
 }
 
-void PluginsDOMHandler::LoadPluginsOnFileThread(
-    std::vector<PluginGroup>* groups,
-    Task* task) {
-  webkit::npapi::PluginList::Singleton()->GetPluginGroups(true, groups);
+void PluginsDOMHandler::LoadPlugins() {
+  if (weak_ptr_factory_.HasWeakPtrs())
+    return;
 
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, task);
-  BrowserThread::PostTask(
-      BrowserThread::UI,
-      FROM_HERE,
-      NewRunnableFunction(&PluginsDOMHandler::EnsurePluginGroupsDeleted,
-                          groups));
+  PluginService::GetInstance()->GetPluginGroups(
+      base::Bind(&PluginsDOMHandler::PluginsLoaded,
+          weak_ptr_factory_.GetWeakPtr()));
 }
 
-void PluginsDOMHandler::EnsurePluginGroupsDeleted(
-    std::vector<PluginGroup>* groups) {
-  delete groups;
-}
-
-void PluginsDOMHandler::LoadPlugins() {
-  if (!get_plugins_factory_.empty())
-    return;
-
-  std::vector<PluginGroup>* groups = new std::vector<PluginGroup>;
-  Task* task = get_plugins_factory_.NewRunnableMethod(
-          &PluginsDOMHandler::PluginsLoaded, groups);
-
-  BrowserThread::PostTask(
-      BrowserThread::FILE,
-      FROM_HERE,
-      NewRunnableFunction(
-          &PluginsDOMHandler::LoadPluginsOnFileThread, groups, task));
-}
-
-void PluginsDOMHandler::PluginsLoaded(const std::vector<PluginGroup>* groups) {
+void PluginsDOMHandler::PluginsLoaded(const std::vector<PluginGroup>& groups) {
   PluginPrefs* plugin_prefs =
       PluginPrefs::GetForProfile(Profile::FromWebUI(web_ui_));
 
   bool all_plugins_enabled_by_policy = true;
   bool all_plugins_disabled_by_policy = true;
 
   // Construct DictionaryValues to return to the UI
   ListValue* plugin_groups_data = new ListValue();
-  for (size_t i = 0; i < groups->size(); ++i) {
+  for (size_t i = 0; i < groups.size(); ++i) {
     ListValue* plugin_files = new ListValue();
-    const PluginGroup& group = (*groups)[i];
+    const PluginGroup& group = groups[i];
     string16 group_name = group.GetGroupName();
     bool group_enabled = false;
     const WebPluginInfo* active_plugin = NULL;
     for (size_t j = 0; j < group.web_plugin_infos().size(); ++j) {
       const WebPluginInfo& group_plugin = group.web_plugin_infos()[j];
 
       DictionaryValue* plugin_file = new DictionaryValue();
       plugin_file->SetString("name", group_plugin.name);
       plugin_file->SetString("description", group_plugin.desc);
       plugin_file->SetString("path", group_plugin.path.value());
@@ skipping 104 matching lines @@
 
 // static
 void PluginsUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kPluginsShowDetails,
                              false,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar,
                              true,
                              PrefService::UNSYNCABLE_PREF);
 }