diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 04:34:14 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 04:34:14 +0000 |
| commit | 8f337212cc8c13bbeb38c54d150f7f848e245b07 (patch) | |
| tree | b1691fa32c63bb13271eeff41f31d280ba19a45e /content/browser/plugin_service_impl.h | |
| parent | 0dbcdb57b84945b2591ee93e1a7c57012383400b (diff) | |
| download | chromium_src-8f337212cc8c13bbeb38c54d150f7f848e245b07.zip chromium_src-8f337212cc8c13bbeb38c54d150f7f848e245b07.tar.gz chromium_src-8f337212cc8c13bbeb38c54d150f7f848e245b07.tar.bz2 | |
Remove plugin_list.h includes from chrome tests in preparation for moving webkit/plugins to content/. To do this, I simplified how we disable plugin loading for tests, and also updated the test in content to use the new way.
BUG=237249
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/19706002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl.h')
| -rw-r--r-- | content/browser/plugin_service_impl.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index c0528f4..b3d928d 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -101,15 +101,14 @@ class CONTENT_EXPORT PluginServiceImpl virtual bool IsPluginUnstable(const base::FilePath& plugin_path) OVERRIDE; virtual void RefreshPlugins() OVERRIDE; virtual void AddExtraPluginPath(const base::FilePath& path) OVERRIDE; - virtual void AddExtraPluginDir(const base::FilePath& path) OVERRIDE; virtual void RemoveExtraPluginPath(const base::FilePath& path) OVERRIDE; - virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE; + virtual void AddExtraPluginDir(const base::FilePath& path) OVERRIDE; virtual void RegisterInternalPlugin( const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE; + virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE; virtual void GetInternalPlugins( std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; - virtual void SetPluginListForTesting( - webkit::npapi::PluginList* plugin_list) OVERRIDE; + virtual void DisablePluginsDiscoveryForTesting() OVERRIDE; #if defined(OS_MACOSX) virtual void AppActivated() OVERRIDE; #endif @@ -207,9 +206,6 @@ class CONTENT_EXPORT PluginServiceImpl const base::FilePath& path); #endif - // The plugin list instance. - webkit::npapi::PluginList* plugin_list_; - #if defined(OS_WIN) // Registry keys for getting notifications when new plugins are installed. base::win::RegKey hkcu_key_; |