Revert r108760 / reland r108744, r108753 w/ fix

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 "base/version.h"
 #include "build/build_config.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/plugin_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/pepper_plugin_info.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"
 
 using content::BrowserThread;
 
 namespace {
 
 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb.
 const uint8 sha2_hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20,
                            0xac, 0xd3, 0x7e, 0x86, 0x8c, 0x86, 0x2c, 0x11,
@@ skipping 123 matching lines @@
 }
 
 void RegisterPepperFlashWithChrome(const FilePath& path,
                                    const Version& version) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::PepperPluginInfo plugin_info;
   // Register it as out-of-process and disabled.
   if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info))
     return;
   PluginPrefs::EnablePluginGlobally(kEnablePepperFlash, plugin_info.path);
-  webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(
+  PluginService::GetInstance()->RegisterInternalPlugin(
       plugin_info.ToWebPluginInfo());
-  webkit::npapi::PluginList::Singleton()->RefreshPlugins();
+  PluginService::GetInstance()->RefreshPlugins();
 }
 
 }  // namespace
 
 class PepperFlashComponentInstaller : public ComponentInstaller {
  public:
   explicit PepperFlashComponentInstaller(const Version& version);
 
   virtual ~PepperFlashComponentInstaller() {}
 
@@ skipping 131 matching lines @@
     }
   }
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(&FinishPepperFlashUpdateRegistration, cus, version));
 }
 
 }  // namespace
 
 void RegisterPepperFlashComponent(ComponentUpdateService* cus) {
-//#if defined(GOOGLE_CHROME_BUILD)
+// #if defined(GOOGLE_CHROME_BUILD)
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       NewRunnableFunction(&StartPepperFlashUpdateRegistration, cus));
-//#endif
+// #endif
 }