Revert 129322 - revert 128949 (and dependent 129252)

chrome/browser/renderer_host/plugin_info_message_filter.h

Index: chrome/browser/renderer_host/plugin_info_message_filter.h
===================================================================
--- chrome/browser/renderer_host/plugin_info_message_filter.h	(revision 129385)
+++ chrome/browser/renderer_host/plugin_info_message_filter.h	(working copy)
@@ -18,6 +18,7 @@
 struct ChromeViewHostMsg_GetPluginInfo_Status;
 class GURL;
 class HostContentSettingsMap;
+class PluginFinder;
 class Profile;
 
 namespace content {
@@ -26,7 +27,10 @@
 
 namespace webkit {
 struct WebPluginInfo;
+namespace npapi {
+class PluginGroup;
 }
+}
 
 // This class filters out incoming IPC messages requesting plug-in information.
 class PluginInfoMessageFilter : public content::BrowserMessageFilter {
@@ -41,10 +45,11 @@
     Context();
     ~Context();
 
-    void DecidePluginStatus(const GetPluginInfo_Params& params,
-                            ChromeViewHostMsg_GetPluginInfo_Status* status,
-                            webkit::WebPluginInfo* plugin,
-                            std::string* actual_mime_type) const;
+    void DecidePluginStatus(
+        const GetPluginInfo_Params& params,
+        const webkit::WebPluginInfo& plugin,
+        PluginFinder* plugin_finder,
+        ChromeViewHostMsg_GetPluginInfo_Status* status) const;
     bool FindEnabledPlugin(int render_view_id,
                            const GURL& url,
                            const GURL& top_origin_url,
@@ -52,7 +57,7 @@
                            ChromeViewHostMsg_GetPluginInfo_Status* status,
                            webkit::WebPluginInfo* plugin,
                            std::string* actual_mime_type) const;
-    void GetPluginContentSetting(const webkit::WebPluginInfo* plugin,
+    void GetPluginContentSetting(const webkit::WebPluginInfo& plugin,
                                  const GURL& policy_url,
                                  const GURL& plugin_url,
                                  const std::string& resource,
@@ -89,6 +94,12 @@
                      IPC::Message* reply_msg,
                      const std::vector<webkit::WebPluginInfo>& plugins);
 
+  void GotPluginFinder(const GetPluginInfo_Params& params,
+                       IPC::Message* reply_msg,
+                       const webkit::WebPluginInfo& plugin,
+                       const std::string& actual_mime_type,
+                       PluginFinder* plugin_finder);
+
   Context context_;
 
   base::WeakPtrFactory<PluginInfoMessageFilter> weak_ptr_factory_;