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

chrome/browser/component_updater/pepper_flash_component_installer.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/component_updater/flash_component_installer.h"
 
 #include <string.h>
 
 #include "base/base_paths.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #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"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/plugin_constants.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 
 namespace {
 
@@ skipping 71 matching lines @@
   // It might be that flapper is using as a temporary hack the PDF interface
   // so we need to check for that as well. TODO(cpu): make this more sane.
   return (strcmp(interface_name, PPB_PDF_INTERFACE) == 0);
 }
 
 }  // namespace
 
 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;
   const std::vector<uint16> ver_nums = flash_version.components();
   if (ver_nums.size() < 3)
     return false;
 
   plugin_info->is_internal = false;
   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",
       kFlashPluginName, ver_nums[0], ver_nums[1], ver_nums[2]);
 
   plugin_info->version = flash_version.GetString();
 
   webkit::WebPluginMimeType swf_mime_type(kFlashPluginSwfMimeType,
                                           kFlashPluginSwfExtension,
                                           kFlashPluginName);
   plugin_info->mime_types.push_back(swf_mime_type);
   webkit::WebPluginMimeType spl_mime_type(kFlashPluginSplMimeType,
                                           kFlashPluginSplExtension,
                                           kFlashPluginName);
   plugin_info->mime_types.push_back(spl_mime_type);
   return true;
 }
 
 void RegisterPepperFlashWithChrome(const FilePath& path,
                                    const Version& version) {
   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();
 }
 
 class PepperFlashComponentInstaller : public ComponentInstaller {
  public:
   explicit PepperFlashComponentInstaller(const Version& version);
 
   virtual ~PepperFlashComponentInstaller() {}
@@ skipping 99 matching lines @@
       NewRunnableFunction(&FinishPepperFlashUpdateRegistration, cus, version));
 }
 
 void RegisterPepperFlashComponent(ComponentUpdateService* cus) {
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
   // TODO(cpu): support Mac and Linux flash pepper.
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       NewRunnableFunction(&StartPepperFlashUpdateRegistration, cus));
 #endif
 }