Index: chrome/browser/extensions/extension_service.cc |
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc |
index 5c05c6cb9b16dba738258e193fd3224aac37b1c0..7dee3e287321718e689b3f61a9c93e5d44d56017 100644 |
--- a/chrome/browser/extensions/extension_service.cc |
+++ b/chrome/browser/extensions/extension_service.cc |
@@ -24,6 +24,7 @@ |
#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" |
@@ -1428,7 +1429,7 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) { |
webkit::npapi::PluginList::Singleton()->AddExtraPluginPath(plugin.path); |
plugins_changed = true; |
if (!plugin.is_public) { |
- PluginService::GetInstance()->RestrictPluginToUrl( |
+ ChromePluginServiceFilter::GetInstance()->RestrictPluginToUrl( |
plugin.path, extension->url()); |
} |
} |
@@ -1520,8 +1521,10 @@ void ExtensionService::NotifyExtensionUnloaded( |
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; |