Revert r108760 / reland r108744, r108753 w/ fix

content/browser/plugin_service.h

 // Copyright (c) 2011 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.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_
 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_
 #pragma once
@@ skipping 36 matching lines @@
 class ResourceContext;
 struct PepperPluginInfo;
 class PluginServiceFilter;
 struct PluginServiceFilterParams;
 }
 
 namespace webkit {
 namespace npapi {
 class PluginGroup;
 class PluginList;
+struct PluginEntryPoints;
 }
 }
 
 // This must be created on the main thread but it's only called on the IO/file
 // thread. This is an asynchronous wrapper around the PluginList interface for
 // querying plugin information. This must be used instead of that to avoid
 // doing expensive disk operations on the IO/UI threads.
 class CONTENT_EXPORT PluginService
     : public base::WaitableEventWatcher::Delegate,
       public content::NotificationObserver {
@@ skipping 77 matching lines @@
                      bool* is_stale,
                      webkit::WebPluginInfo* info,
                      std::string* actual_mime_type);
 
   // Get plugin info by plugin path (including disabled plugins). Returns true
   // if the plugin is found and WebPluginInfo has been filled in |info|. This
   // will use cached data in the plugin list.
   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);
 
   // Asynchronously loads the list of plugin groups if necessary and then calls
   // back to the provided function on the calling MessageLoop on completion.
   void GetPluginGroups(const GetPluginGroupsCallback& callback);
 
   // Tells all the renderer processes associated with the given browser context
   // to throw away their cache of the plugin list, and optionally also reload
   // all the pages with plugins. If |browser_context| is NULL, purges the cache
   // in all renderers.
   // NOTE: can only be called on the UI thread.
   static void PurgePluginListCache(content::BrowserContext* browser_context,
                                    bool reload_pages);
 
   void set_filter(content::PluginServiceFilter* filter) {
     filter_ = filter;
   }
   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>;
 
   // Creates the PluginService object, but doesn't actually build the plugin
   // list yet.  It's generated lazily.
   PluginService();
   virtual ~PluginService();
 
   // base::WaitableEventWatcher::Delegate implementation.
   virtual void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
@@ skipping 73 matching lines @@
 #if defined(OS_POSIX)
   scoped_refptr<PluginLoaderPosix> plugin_loader_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(PluginService);
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);
 
 #endif  // CONTENT_BROWSER_PLUGIN_SERVICE_H_