Add PluginServiceFilter interface.

content/browser/renderer_host/render_message_filter.h

Index: content/browser/renderer_host/render_message_filter.h
diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h
index 8cdd4960634013378550e509bd730796cc51ebe4..9933ed621303d549cb6c426ad489d4c89ff82ba6 100644
--- a/content/browser/renderer_host/render_message_filter.h
+++ b/content/browser/renderer_host/render_message_filter.h
@@ -21,13 +21,14 @@
 #include "build/build_config.h"
 #include "content/browser/browser_message_filter.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
+#include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/surface/transport_dib.h"
 
 struct FontDescriptor;
-class HostContentSettingsMap;
+class Profile;
 class RenderWidgetHelper;
 struct ViewHostMsg_CreateWindow_Params;
 struct ViewHostMsg_CreateWorker_Params;
@@ -76,8 +77,6 @@ class RenderMessageFilter : public BrowserMessageFilter {
                       RenderWidgetHelper* render_widget_helper);
 
   // BrowserMessageFilter methods:
-  virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread);
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok);
   virtual void OnDestruct() const;
@@ -150,16 +149,15 @@ class RenderMessageFilter : public BrowserMessageFilter {
 #endif
 
   void OnGetPlugins(bool refresh,
-                    std::vector<webkit::npapi::WebPluginInfo>* plugins);
+                    IPC::Message* reply_msg);
   void OnGetPluginInfo(int routing_id,
                        const GURL& url,
                        const GURL& policy_url,
                        const std::string& mime_type,
-                       bool* found,
-                       webkit::npapi::WebPluginInfo* info,
-                       std::string* actual_mime_type);
+                       IPC::Message* reply_msg);
   void OnOpenChannelToPlugin(int routing_id,
                              const GURL& url,
+                             const GURL& policy_url,
                              const std::string& mime_type,
                              IPC::Message* reply_msg);
   void OnOpenChannelToPepperPlugin(const FilePath& path,
@@ -229,6 +227,14 @@ class RenderMessageFilter : public BrowserMessageFilter {
   bool CheckBenchmarkingEnabled() const;
   bool CheckPreparsedJsCachingEnabled() const;
 
+  void GetPluginsOnFileThread(bool refresh,
+                              PluginService::Filter* filter,
+                              IPC::Message* reply_msg);
+  void GetPluginInfoOnFileThread(const GURL& url,
+                                 const std::string& mime_type,
+                                 PluginService::Filter* filter,
+                                 IPC::Message* reply_msg);
+
   // Cached resource request dispatcher host and plugin service, guaranteed to
   // be non-null if Init succeeds. We do not own the objects, they are managed
   // by the BrowserProcess, which has a wider scope than we do.