Changing PluginPrefs to use PluginFinder's async interface.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2012 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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 188 matching lines @@
 
 namespace {
 
 // Helper to reply asynchronously if |automation| is still valid.
 void SendSuccessReply(base::WeakPtr<AutomationProvider> automation,
                       IPC::Message* reply_message) {
   if (automation)
     AutomationJSONReply(automation.get(), reply_message).SendSuccess(NULL);
 }
 
+// Helper to process the result of CanEnablePlugin.
+void DidEnablePlugin(base::WeakPtr<AutomationProvider> automation,
+                     IPC::Message* reply_message,
+                     const FilePath::StringType& path,
+                     const std::string& error_msg,
+                     bool can_enable) {

[Bernhard Bauer, 2012/09/03 08:57:12]

Nit: |did_enable| :)

[ibraaaa, 2012/09/03 09:10:28]

Done.

+  if (can_enable) {
+    SendSuccessReply(automation, reply_message);
+  } else {
+    if (automation) {
+      AutomationJSONReply(automation.get(), reply_message).SendError(
+          StringPrintf(error_msg.c_str(), path.c_str()));
+    }
+  }
+}
+
 // Helper to resolve the overloading of PostTask.
 void PostTask(BrowserThread::ID id, const base::Closure& callback) {
   BrowserThread::PostTask(id, FROM_HERE, callback);
 }
 
 void SendMouseClick(int flags) {
   ui_controls::MouseButton button = ui_controls::LEFT;
   if ((flags & ui::EF_LEFT_MOUSE_BUTTON) ==
       ui::EF_LEFT_MOUSE_BUTTON) {
     button = ui_controls::LEFT;
@@ skipping 3159 matching lines @@
 //      "path": "/Library/Internet Plug-Ins/Flash Player.plugin" }
 void TestingAutomationProvider::EnablePlugin(Browser* browser,
                                              DictionaryValue* args,
                                              IPC::Message* reply_message) {
   FilePath::StringType path;
   if (!args->GetString("path", &path)) {
     AutomationJSONReply(this, reply_message).SendError("path not specified.");
     return;
   }
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(browser->profile());
-  if (!plugin_prefs->CanEnablePlugin(true, FilePath(path))) {
-    AutomationJSONReply(this, reply_message).SendError(
-        StringPrintf("Could not enable plugin for path %s.", path.c_str()));
-    return;
-  }
-  plugin_prefs->EnablePlugin(
-      true, FilePath(path),
-      base::Bind(SendSuccessReply, AsWeakPtr(), reply_message));
+  plugin_prefs->EnablePlugin(true, FilePath(path),
+      base::Bind(&DidEnablePlugin, AsWeakPtr(), reply_message,
+                 path, "Could not enable plugin for path %s."));
 }
 
 // Sample json input:
 //    { "command": "DisablePlugin",
 //      "path": "/Library/Internet Plug-Ins/Flash Player.plugin" }
 void TestingAutomationProvider::DisablePlugin(Browser* browser,
                                               DictionaryValue* args,
                                               IPC::Message* reply_message) {
   FilePath::StringType path;
   if (!args->GetString("path", &path)) {
     AutomationJSONReply(this, reply_message).SendError("path not specified.");
     return;
   }
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(browser->profile());
-  if (!plugin_prefs->CanEnablePlugin(false, FilePath(path))) {
-    AutomationJSONReply(this, reply_message).SendError(
-        StringPrintf("Could not disable plugin for path %s.", path.c_str()));
-    return;
-  }
-  plugin_prefs->EnablePlugin(
-      false, FilePath(path),
-      base::Bind(SendSuccessReply, AsWeakPtr(), reply_message));
+  plugin_prefs->EnablePlugin(false, FilePath(path),
+      base::Bind(&DidEnablePlugin, AsWeakPtr(), reply_message,
+                 path, "Could not disable plugin for path %s."));
 }
 
 // Sample json input:
 //    { "command": "SaveTabContents",
 //      "tab_index": 0,
 //      "filename": <a full pathname> }
 // Sample json output:
 //    {}
 void TestingAutomationProvider::SaveTabContents(
     Browser* browser,
@@ skipping 3308 matching lines @@
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   if (chrome::GetActiveWebContents(browser) != tab)
     chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, tab), true);
 }