Finish moving plugin probing out of process.

content/browser/plugin_service_filter.h

Index: content/browser/plugin_service_filter.h
diff --git a/content/browser/plugin_service_filter.h b/content/browser/plugin_service_filter.h
index 790c501d18ae110992f8d53b02f2326751de2e1f..12bd11416ee25b95ba75f30a34439dcfb26fb8d5 100644
--- a/content/browser/plugin_service_filter.h
+++ b/content/browser/plugin_service_filter.h
@@ -6,7 +6,7 @@
 #define CONTENT_BROWSER_PLUGIN_FILTER_H_
 #pragma once
 
-class GURL;
+#include "googleurl/src/gurl.h"
 
 namespace webkit {
 struct WebPluginInfo;
@@ -16,11 +16,21 @@ namespace content {
 
 class ResourceContext;
 
+// base::Bind() has limited arity, and the filter-related methods tend to
+// surpass that limit.
+struct PluginServiceFilterParams {
+  int render_process_id;
+  int render_view_id;
+  GURL page_url;
+  const ResourceContext* resource_context;
+};
+
 // Callback class to let the client filter the list of all installed plug-ins.
 // This class is called on the FILE thread.
 class PluginServiceFilter {
  public:
   virtual ~PluginServiceFilter() {}
+
   // Whether to use |plugin|. The client can return false to disallow the
   // plugin, or return true and optionally change the passed in plugin.
   virtual bool ShouldUsePlugin(