Index: chrome/browser/plugins/chrome_plugin_service_filter.h |
diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h |
index 88c9ff47e2c5be8b8b92ceacfaed97afc96e20ec..dbb4844d64cb84a2375d56a5f9c157b6d51eac63 100644 |
--- a/chrome/browser/plugins/chrome_plugin_service_filter.h |
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.h |
@@ -11,20 +11,16 @@ |
#include <string> |
#include <vector> |
-#include "base/containers/hash_tables.h" |
#include "base/files/file_path.h" |
-#include "base/memory/ref_counted.h" |
#include "base/memory/singleton.h" |
#include "base/synchronization/lock.h" |
-#include "build/build_config.h" |
+#include "chrome/browser/plugins/plugin_prefs.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "content/public/browser/plugin_service_filter.h" |
#include "content/public/common/webplugininfo.h" |
#include "url/gurl.h" |
-class HostContentSettingsMap; |
-class PluginPrefs; |
class Profile; |
namespace content { |
@@ -77,9 +73,16 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter, |
bool CanLoadPlugin(int render_process_id, |
const base::FilePath& path) override; |
+ protected: |
+ ChromePluginServiceFilter(); |
+ ~ChromePluginServiceFilter() override; |
+ |
+ // Virtual so this can be overridden in tests. |
+ virtual scoped_refptr<PluginPrefs> GetPluginPrefsForProfile(Profile* profile); |
+ |
private: |
- struct ContextInfo; |
friend struct base::DefaultSingletonTraits<ChromePluginServiceFilter>; |
+ struct ContextInfo; |
struct OverriddenPlugin { |
OverriddenPlugin(); |
@@ -99,9 +102,6 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter, |
std::set<base::FilePath> authorized_plugins; |
}; |
- ChromePluginServiceFilter(); |
- ~ChromePluginServiceFilter() override; |
- |
// content::NotificationObserver implementation: |
void Observe(int type, |
const content::NotificationSource& source, |