diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 23:20:05 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 23:20:05 +0000 |
| commit | ee06617d1e7e2486c04e62e945e88b23e3fdfcc8 (patch) | |
| tree | e2d47f47ce5efebac81a5331fd9b73128f176dbf /webkit | |
| parent | 087610afc8895ae2703ceed23a46706e858ec87c (diff) | |
| download | chromium_src-ee06617d1e7e2486c04e62e945e88b23e3fdfcc8.zip chromium_src-ee06617d1e7e2486c04e62e945e88b23e3fdfcc8.tar.gz chromium_src-ee06617d1e7e2486c04e62e945e88b23e3fdfcc8.tar.bz2 | |
Refactor PluginService to take PluginList as a dependency.
Also creates MockPluginService for use in tests.
BUG=103788,chromium-os:22447
TEST=none
Review URL: http://codereview.chromium.org/8493019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/npapi/mock_plugin_list.cc | 6 | ||||
| -rw-r--r-- | webkit/plugins/npapi/mock_plugin_list.h | 4 | ||||
| -rw-r--r-- | webkit/plugins/npapi/plugin_list.h | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/webkit/plugins/npapi/mock_plugin_list.cc b/webkit/plugins/npapi/mock_plugin_list.cc index 5280052..1411ef5 100644 --- a/webkit/plugins/npapi/mock_plugin_list.cc +++ b/webkit/plugins/npapi/mock_plugin_list.cc @@ -23,6 +23,12 @@ void MockPluginList::ClearPluginsToLoad() { plugins_to_load_.clear(); } +bool MockPluginList::GetPluginsIfNoRefreshNeeded( + std::vector<webkit::WebPluginInfo>* plugins) { + GetPlugins(plugins); + return true; +} + void MockPluginList::LoadPluginsInternal( ScopedVector<PluginGroup>* plugin_groups) { for (size_t i = 0; i < plugins_to_load_.size(); ++i) diff --git a/webkit/plugins/npapi/mock_plugin_list.h b/webkit/plugins/npapi/mock_plugin_list.h index 15c11c9..4ef5c3d 100644 --- a/webkit/plugins/npapi/mock_plugin_list.h +++ b/webkit/plugins/npapi/mock_plugin_list.h @@ -21,6 +21,10 @@ class MockPluginList : public PluginList { void AddPluginToLoad(const WebPluginInfo& plugin); void ClearPluginsToLoad(); + // PluginList: + virtual bool GetPluginsIfNoRefreshNeeded( + std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; + private: std::vector<WebPluginInfo> plugins_to_load_; diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h index 847af14..9eb279c 100644 --- a/webkit/plugins/npapi/plugin_list.h +++ b/webkit/plugins/npapi/plugin_list.h @@ -126,7 +126,8 @@ class PluginList { // Returns true if the list of plugins is cached and is copied into the out // pointer; returns false if the plugin list needs to be refreshed. - bool GetPluginsIfNoRefreshNeeded(std::vector<webkit::WebPluginInfo>* plugins); + virtual bool GetPluginsIfNoRefreshNeeded( + std::vector<webkit::WebPluginInfo>* plugins); // Returns a list in |info| containing plugins that are found for // the given url and mime type (including disabled plugins, for |