Revert r108760 / reland r108744, r108753 w/ fix

chrome/browser/component_updater/npapi_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 "base/base_paths.h"
 #include "base/bind.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/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/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;
 
 namespace {
 
 // CRX hash. The extension id is: immdilkhigodmjbnngapbehchmihabbg.
 const uint8 sha2_hash[] = {0x8c, 0xc3, 0x8b, 0xa7, 0x86, 0xe3, 0xc9, 0x1d,
                            0xd6, 0x0f, 0x14, 0x72, 0x7c, 0x87, 0x01, 0x16,
                            0xe2, 0x00, 0x6c, 0x98, 0xbc, 0xfb, 0x14, 0x1b,
@@ skipping 68 matching lines @@
     return false;
   if (current_version_.CompareTo(version) >= 0)
     return false;
   if (!file_util::PathExists(unpack_path.Append(kFlashPluginFileName)))
     return false;
   // Passed the basic tests. Time to install it.
   if (!file_util::Move(unpack_path, GetNPAPIFlashBaseDirectory()))
     return false;
   // Installation is done. Now tell the rest of chrome.
   current_version_ = version;
-  webkit::npapi::PluginList::Singleton()->RefreshPlugins();
+  PluginService::GetInstance()->RefreshPlugins();
   return true;
 }
 
 void FinishFlashUpdateRegistration(ComponentUpdateService* cus,
                                    const webkit::WebPluginInfo& info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // todo(cpu): Add PluginPrefs code here to determine if what we update
   // is actually going to be used.
 
@@ skipping 76 matching lines @@
 // you don't see version comparison in this code.
 //
 // So to kick off the magic we add the updated flash path here, even though
 // there might not be a flash player in that location. If there is and it is
 // newer, it will take its place then we fire StartFlashUpdateRegistration
 // on the IO thread to learn which one won. Since we do it in a delayed task
 // probably somebody (unknowingly) will pay for the file IO, so usually get
 // 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.
   BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&PluginService::GetPlugins,
                  base::Unretained(PluginService::GetInstance()),
                  base::Bind(&StartFlashUpdateRegistration, cus)),
       8000);
 #endif
 }