Remove plugin_list.h includes from chrome tests in preparation for moving webkit/plugins to content…

webkit/plugins/npapi/plugin_list.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 81 matching lines @@
   // This second version is for "plugins" that have been compiled directly into
   // the binary -- callers must provide the plugin information and the entry
   // points.
   void RegisterInternalPluginWithEntryPoints(
       const webkit::WebPluginInfo& info,
       bool add_at_beginning,
       const PluginEntryPoints& entry_points);
 
   // 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.
   void GetInternalPlugins(std::vector<webkit::WebPluginInfo>* plugins);
 
   // Creates a WebPluginInfo structure given a plugin's path.  On success
   // returns true, with the information being put into "info".  If it's an
   // internal plugin, "entry_points" is filled in as well with a
   // internally-owned PluginEntryPoints pointer.
   // Returns false if the library couldn't be found, or if it's not a plugin.
   bool ReadPluginInfo(const base::FilePath& filename,
                       webkit::WebPluginInfo* info,
                       const PluginEntryPoints** entry_points);
 
   // In Windows plugins, the mime types are passed as a specially formatted list
   // of strings. This function parses those strings into a WebPluginMimeType
   // vector.
   // TODO(evan): move this code into plugin_list_win.
   static bool ParseMimeTypes(
       const std::string& mime_types,
       const std::string& file_extensions,
       const base::string16& mime_type_descriptions,
       std::vector<webkit::WebPluginMimeType>* parsed_mime_types);
 
   // Get all the plugins synchronously, loading them if necessary.
   void GetPlugins(std::vector<webkit::WebPluginInfo>* plugins);
 
   // 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
   // the given url and mime type (including disabled plugins, for
   // which |info->enabled| is false).  The mime type which corresponds
   // to the URL is optionally returned back in |actual_mime_types| (if
   // it is non-NULL), one for each of the plugin info objects found.
   // The |allow_wildcard| parameter controls whether this function
   // returns plugins which support wildcard mime types (* as the mime
   // type).  The |info| parameter is required to be non-NULL.  The
@@ skipping 38 matching lines @@
   // This API is only used on Unixes, and is exposed here for testing.
   static void ParseMIMEDescription(const std::string& description,
       std::vector<webkit::WebPluginMimeType>* mime_types);
 
   // Extract a version number from a description string.
   // This API is only used on Unixes, and is exposed here for testing.
   static void ExtractVersionString(const std::string& version,
                                    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,
     LOADING_STATE_REFRESHING,
     LOADING_STATE_UP_TO_DATE,
   };
 
   struct InternalPlugin {
     webkit::WebPluginInfo info;
     PluginEntryPoints entry_points;
   };
 
   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(
       std::vector<webkit::WebPluginInfo>* plugins);
 
   // Load all plugins from the default plugins directory.
   void LoadPlugins();
 
   // Walks a directory and produces a list of all the plugins to potentially
   // load in that directory.
@@ skipping 56 matching lines @@
   // in common places.
   bool plugins_discovery_disabled_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginList);
 };
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_