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 /webkit/plugins/npapi/plugin_list.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 'webkit/plugins/npapi/plugin_list.h')
| -rw-r--r-- | webkit/plugins/npapi/plugin_list.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h index 73bca62..2b800d8 100644 --- a/webkit/plugins/npapi/plugin_list.h +++ b/webkit/plugins/npapi/plugin_list.h @@ -99,8 +99,6 @@ class PluginList { // Removes a specified internal plugin from the list. The search will match // on the path from the version info previously registered. - // - // This is generally only necessary for tests. void UnregisterInternalPlugin(const base::FilePath& path); // Gets a list of all the registered internal plugins. @@ -130,7 +128,7 @@ class PluginList { // Copies the list of plug-ins into |plugins| without loading them. // Returns true if the list of plugins is up-to-date. - virtual bool GetPluginsNoRefresh( + bool GetPluginsNoRefresh( std::vector<webkit::WebPluginInfo>* plugins); // Returns a list in |info| containing plugins that are found for @@ -189,11 +187,6 @@ class PluginList { webkit::WebPluginInfo* info); #endif - protected: - // Constructors are private for singletons but we expose this one - // for subclasses for test purposes. - PluginList(); - private: enum LoadingState { LOADING_STATE_NEEDS_REFRESH, @@ -209,6 +202,8 @@ class PluginList { friend class PluginListTest; friend struct base::DefaultLazyInstanceTraits<PluginList>; + PluginList(); + // Implements all IO dependent operations of the LoadPlugins method so that // test classes can mock these out. virtual void LoadPluginsIntoPluginListInternal( |