Revert r108760 / reland r108744, r108753 w/ fix

chrome/browser/component_updater/npapi_flash_component_installer.cc

Index: chrome/browser/component_updater/npapi_flash_component_installer.cc
diff --git a/chrome/browser/component_updater/npapi_flash_component_installer.cc b/chrome/browser/component_updater/npapi_flash_component_installer.cc
index 86c68a61b0386f4145552d49c6f1443730b2b29e..7b4d40426100281c792aa47b6a4b89948488d4aa 100644
--- a/chrome/browser/component_updater/npapi_flash_component_installer.cc
+++ b/chrome/browser/component_updater/npapi_flash_component_installer.cc
@@ -18,7 +18,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "content/browser/plugin_service.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using content::BrowserThread;
@@ -107,7 +106,7 @@ bool NPAPIFlashComponentInstaller::Install(base::DictionaryValue* manifest,
     return false;
   // Installation is done. Now tell the rest of chrome.
   current_version_ = version;
-  webkit::npapi::PluginList::Singleton()->RefreshPlugins();
+  PluginService::GetInstance()->RefreshPlugins();
   return true;
 }
 
@@ -204,10 +203,9 @@ void StartFlashUpdateRegistration(ComponentUpdateService* cus,
 // the information for free.
 void RegisterNPAPIFlashComponent(ComponentUpdateService* cus) {
 #if !defined(OS_CHROMEOS)
-  webkit::npapi::PluginList* plugins = webkit::npapi::PluginList::Singleton();
   FilePath path = GetNPAPIFlashBaseDirectory().Append(kFlashPluginFileName);
-  plugins->AddExtraPluginPath(path);
-  plugins->RefreshPlugins();
+  PluginService::GetInstance()->AddExtraPluginPath(path);
+  PluginService::GetInstance()->RefreshPlugins();
 
   // Post the task to the FILE thread because IO may be done once the plugins
   // are loaded.