Finish moving plugin probing out of process.

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 27 matching lines @@
 struct PepperPluginInfo;
 class PluginDirWatcherDelegate;
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace content {
 class ResourceContext;
 class PluginServiceFilter;
+struct PluginServiceFilterParams;
 }
 
 namespace webkit {
 namespace npapi {
 class PluginGroup;
 class PluginList;
 }
 }
 
 // This must be created on the main thread but it's only called on the IO/file
@@ skipping 73 matching lines @@
   // Gets plugin info for an individual plugin and filters the plugins using
   // the |context| and renderer IDs. This will report whether the data is stale
   // via |is_stale| and returns whether or not the plugin can be found.
   bool GetPluginInfo(int render_process_id,
                      int render_view_id,
                      const content::ResourceContext& context,
                      const GURL& url,
                      const GURL& page_url,
                      const std::string& mime_type,
                      bool allow_wildcard,
-                     bool* use_stale,
+                     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.
@@ skipping 25 matching lines @@
                        const NotificationDetails& details);
 
   void RegisterPepperPlugins();
 
   PepperPluginInfo* GetRegisteredPpapiPluginInfo(const FilePath& plugin_path);
 
   // Function that is run on the FILE thread to load the plugins synchronously.
   void GetPluginsInternal(base::MessageLoopProxy* target_loop,
                           const GetPluginsCallback& callback);
 
+  // Binding directly to GetAllowedPluginForOpenChannelToPlugin() isn't possible
+  // because more arity is needed <http://crbug.com/98542>. This just forwards.
+  void ForwardGetAllowedPluginForOpenChannelToPlugin(
+      const content::PluginServiceFilterParams& params,
+      const GURL& url,
+      const std::string& mime_type,
+      PluginProcessHost::Client* client,
+      const std::vector<webkit::WebPluginInfo>&);
   // Helper so we can do the plugin lookup on the FILE thread.
   void GetAllowedPluginForOpenChannelToPlugin(
       int render_process_id,
       int render_view_id,
       const GURL& url,
       const GURL& page_url,
       const std::string& mime_type,
       PluginProcessHost::Client* client,
       const content::ResourceContext* resource_context);
 
@@ skipping 37 matching lines @@
   content::PluginServiceFilter* filter_;
 
   std::set<PluginProcessHost::Client*> pending_plugin_clients_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginService);
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);
 
 #endif  // CONTENT_BROWSER_PLUGIN_SERVICE_H_