Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Unified Diff: webkit/plugins/npapi/plugin_list.h

Issue 19706002: Remove plugin_list.h includes from chrome tests in preparation for moving webkit/plugins to content… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix posix tests Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/npapi/mock_plugin_list.cc ('k') | webkit/plugins/npapi/plugin_list_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/plugin_list.h
===================================================================
--- webkit/plugins/npapi/plugin_list.h (revision 212185)
+++ webkit/plugins/npapi/plugin_list.h (working copy)
@@ -99,8 +99,6 @@
// 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 @@
// 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 @@
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 @@
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(
« no previous file with comments | « webkit/plugins/npapi/mock_plugin_list.cc ('k') | webkit/plugins/npapi/plugin_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698