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

chrome/browser/component_updater/pepper_flash_component_installer.cc

Index: chrome/browser/component_updater/pepper_flash_component_installer.cc
===================================================================
--- chrome/browser/component_updater/pepper_flash_component_installer.cc	(revision 101270)
+++ chrome/browser/component_updater/pepper_flash_component_installer.cc	(working copy)
@@ -16,7 +16,6 @@
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
-#include "chrome/browser/plugin_prefs.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/pepper_plugin_registry.h"
@@ -108,6 +107,7 @@
 bool MakePepperFlashPluginInfo(const FilePath& flash_path,
                                const Version& flash_version,
                                bool out_of_process,
+                               bool enabled,
                                PepperPluginInfo* plugin_info) {
   if (!flash_version.IsValid())
     return false;
@@ -119,6 +119,7 @@
   plugin_info->is_out_of_process = out_of_process;
   plugin_info->path = flash_path;
   plugin_info->name = kFlashPluginName;
+  plugin_info->enabled = enabled;
 
   // The description is like "Shockwave Flash 10.2 r154".
   plugin_info->description = StringPrintf("%s %d.%d r%d",
@@ -142,9 +143,8 @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PepperPluginInfo plugin_info;
   // Register it as out-of-process and disabled.
-  if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info))
+  if (!MakePepperFlashPluginInfo(path, version, true, false, &plugin_info))
     return;
-  PluginPrefs::EnablePluginGlobally(false, plugin_info.path);
   webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(
       plugin_info.ToWebPluginInfo());
   webkit::npapi::PluginList::Singleton()->RefreshPlugins();
Property changes on: chrome/browser/component_updater/pepper_flash_component_installer.cc
___________________________________________________________________
Added: svn:mergeinfo