Revert 101269 - Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo, to ...

chrome/browser/automation/testing_automation_provider.cc

Index: chrome/browser/automation/testing_automation_provider.cc
===================================================================
--- chrome/browser/automation/testing_automation_provider.cc	(revision 101270)
+++ chrome/browser/automation/testing_automation_provider.cc	(working copy)
@@ -3536,9 +3536,12 @@
   if (!args->GetString("path", &path)) {
     reply.SendError("path not specified.");
     return;
+  } else if (!webkit::npapi::PluginList::Singleton()->EnablePlugin(
+        FilePath(path))) {
+    reply.SendError(StringPrintf("Could not enable plugin for path %s.",
+                                 path.c_str()));
+    return;
   }
-  PluginPrefs::GetForProfile(browser->profile())->EnablePlugin(
-      true, FilePath(path));
   reply.SendSuccess(NULL);
 }
 
@@ -3553,9 +3556,12 @@
   if (!args->GetString("path", &path)) {
     reply.SendError("path not specified.");
     return;
+  } else if (!webkit::npapi::PluginList::Singleton()->DisablePlugin(
+        FilePath(path))) {
+    reply.SendError(StringPrintf("Could not disable plugin for path %s.",
+                                 path.c_str()));
+    return;
   }
-  PluginPrefs::GetForProfile(browser->profile())->EnablePlugin(
-      false, FilePath(path));
   reply.SendSuccess(NULL);
 }
 
Property changes on: chrome/browser/automation/testing_automation_provider.cc
___________________________________________________________________
Added: svn:mergeinfo