Revert r108760 / reland r108744, r108753 w/ fix

chrome/browser/extensions/extension_service.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/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 78 matching lines @@
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/registry_controlled_domain.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/database/database_util.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/extensions/extension_input_ime_api.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
@@ skipping 852 matching lines @@
   // Same for chrome://thumb/ resources.
   if (extension->HasHostPermission(GURL(chrome::kChromeUIThumbnailURL))) {
     ThumbnailSource* thumbnail_source = new ThumbnailSource(profile_);
     profile_->GetChromeURLDataManager()->AddDataSource(thumbnail_source);
   }
 
   // TODO(mpcomplete): This ends up affecting all profiles. See crbug.com/80757.
   bool plugins_changed = false;
   for (size_t i = 0; i < extension->plugins().size(); ++i) {
     const Extension::PluginInfo& plugin = extension->plugins()[i];
-    webkit::npapi::PluginList::Singleton()->RefreshPlugins();
-    webkit::npapi::PluginList::Singleton()->AddExtraPluginPath(plugin.path);
+    PluginService::GetInstance()->RefreshPlugins();
+    PluginService::GetInstance()->AddExtraPluginPath(plugin.path);
     plugins_changed = true;
     ChromePluginServiceFilter* filter =
         ChromePluginServiceFilter::GetInstance();
     if (plugin.is_public) {
       filter->RestrictPluginToProfileAndOrigin(
           plugin.path, profile_, GURL());
     } else {
       filter->RestrictPluginToProfileAndOrigin(
           plugin.path, profile_, extension->url());
     }
@@ skipping 77 matching lines @@
 #endif
 
   UpdateActiveExtensionsInCrashReporter();
 
   bool plugins_changed = false;
   for (size_t i = 0; i < extension->plugins().size(); ++i) {
     const Extension::PluginInfo& plugin = extension->plugins()[i];
     if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                                  base::Bind(&ForceShutdownPlugin, plugin.path)))
       NOTREACHED();
-    webkit::npapi::PluginList::Singleton()->RefreshPlugins();
-    webkit::npapi::PluginList::Singleton()->RemoveExtraPluginPath(
-        plugin.path);
+    PluginService::GetInstance()->RefreshPlugins();
+    PluginService::GetInstance()->RemoveExtraPluginPath(plugin.path);
     plugins_changed = true;
     ChromePluginServiceFilter::GetInstance()->UnrestrictPlugin(plugin.path);
   }
 
   bool nacl_modules_changed = false;
   for (size_t i = 0; i < extension->nacl_modules().size(); ++i) {
     const Extension::NaClModuleInfo& module = extension->nacl_modules()[i];
     UnregisterNaClModule(module.url);
     nacl_modules_changed = true;
   }
@@ skipping 1358 matching lines @@
   for (size_t i = 0; i < plugins.size(); ++i) {
     pepper_info = &plugins[i];
     CHECK(pepper_info);
     std::vector<webkit::WebPluginMimeType>::const_iterator mime_iter;
     // Check each MIME type the plugins handle for the NaCl MIME type.
     for (mime_iter = pepper_info->mime_types.begin();
          mime_iter != pepper_info->mime_types.end(); ++mime_iter) {
       if (mime_iter->mime_type == kNaClPluginMimeType) {
         // This plugin handles "application/x-nacl".
 
-        webkit::npapi::PluginList::Singleton()->
+        PluginService::GetInstance()->
             UnregisterInternalPlugin(pepper_info->path);
 
         webkit::WebPluginInfo info = pepper_info->ToWebPluginInfo();
 
         for (ExtensionService::NaClModuleInfoList::const_iterator iter =
             nacl_module_list_.begin();
             iter != nacl_module_list_.end(); ++iter) {
           // Add the MIME type specified in the extension to this NaCl plugin,
           // With an extra "nacl" argument to specify the location of the NaCl
           // manifest file.
           webkit::WebPluginMimeType mime_type_info;
           mime_type_info.mime_type = iter->mime_type;
           mime_type_info.additional_param_names.push_back(UTF8ToUTF16("nacl"));
           mime_type_info.additional_param_values.push_back(
               UTF8ToUTF16(iter->url.spec()));
           info.mime_types.push_back(mime_type_info);
         }
 
-        webkit::npapi::PluginList::Singleton()->RefreshPlugins();
-        webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info);
+        PluginService::GetInstance()->RefreshPlugins();
+        PluginService::GetInstance()->RegisterInternalPlugin(info);
         // This plugin has been modified, no need to check the rest of its
         // types, but continue checking other plugins.
         break;
       }
     }
   }
 }
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }