Revert r108760 / reland r108744, r108753 w/ fix

content/browser/plugin_service.h

Index: content/browser/plugin_service.h
diff --git a/content/browser/plugin_service.h b/content/browser/plugin_service.h
index 2b2c69f225f2812bdcc9a555ecc05acfe6158a6d..6be2c4f3623da48ed3d5fab10ca438be07473a8b 100644
--- a/content/browser/plugin_service.h
+++ b/content/browser/plugin_service.h
@@ -54,6 +54,7 @@ namespace webkit {
 namespace npapi {
 class PluginGroup;
 class PluginList;
+struct PluginEntryPoints;
 }
 }
 
@@ -151,10 +152,6 @@ class CONTENT_EXPORT PluginService
   bool GetPluginInfoByPath(const FilePath& plugin_path,
                            webkit::WebPluginInfo* info);
 
-  // Marks the plugin list as dirty and will cause the plugins to be reloaded
-  // on the next access through GetPlugins() or GetPluginGroups().
-  void RefreshPluginList();
-
   // Asynchronously loads plugins if necessary and then calls back to the
   // provided function on the calling MessageLoop on completion.
   void GetPlugins(const GetPluginsCallback& callback);
@@ -176,6 +173,22 @@ class CONTENT_EXPORT PluginService
   }
   content::PluginServiceFilter* filter() { return filter_; }
 
+
+  // The following functions are wrappers around webkit::npapi::PluginList.
+  // These must be used instead of those in order to ensure that we have a
+  // single global list in the component build and so that we don't
+  // accidentally load plugins in the wrong process or thread. Refer to
+  // PluginList for further documentation of these functions.
+  void RefreshPlugins();
+  void AddExtraPluginPath(const FilePath& path);
+  void RemoveExtraPluginPath(const FilePath& path);
+  void UnregisterInternalPlugin(const FilePath& path);
+  void RegisterInternalPlugin(const webkit::WebPluginInfo& info);
+  string16 GetPluginGroupName(const std::string& plugin_name);
+
+  // TODO(dpranke): This should be private.
+  webkit::npapi::PluginList* plugin_list();
+
  private:
   friend struct DefaultSingletonTraits<PluginService>;