Add PluginServiceFilter interface.

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"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/extensions/extension_bookmarks_module.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_cookies_api.h"
 #include "chrome/browser/extensions/extension_data_deleter.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_history_api.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ skipping 1384 matching lines @@
   }
 
   // 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);
     plugins_changed = true;
     if (!plugin.is_public) {
-      PluginService::GetInstance()->RestrictPluginToUrl(
+      ChromePluginServiceFilter::GetInstance()->RestrictPluginToUrl(
           plugin.path, extension->url());
     }
   }
 
   bool nacl_modules_changed = false;
   for (size_t i = 0; i < extension->nacl_modules().size(); ++i) {
     const Extension::NaClModuleInfo& module = extension->nacl_modules()[i];
     RegisterNaClModule(module.url, module.mime_type);
     nacl_modules_changed = true;
   }
@@ skipping 71 matching lines @@
   for (size_t i = 0; i < extension->plugins().size(); ++i) {
     const Extension::PluginInfo& plugin = extension->plugins()[i];
     if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                                  NewRunnableFunction(&ForceShutdownPlugin,
                                                      plugin.path)))
       NOTREACHED();
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
     webkit::npapi::PluginList::Singleton()->RemoveExtraPluginPath(
         plugin.path);
     plugins_changed = true;
-    if (!plugin.is_public)
-      PluginService::GetInstance()->RestrictPluginToUrl(plugin.path, GURL());
+    if (!plugin.is_public) {
+      ChromePluginServiceFilter::GetInstance()->RestrictPluginToUrl(
+          plugin.path, GURL());
+    }
   }
 
   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;
   }
 
   if (nacl_modules_changed)
@@ skipping 1046 matching lines @@
 
 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();
 }