Browser Plugin: Only install BrowserPluginMessageFilter if render process supports BrowserPlugin.

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index c186bd360568a77a36bb69e18019cef1c5031567..884bcc10fa1b7699b16b477049cf0e00d570809e 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -358,6 +358,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) {
 RenderProcessHostImpl::RenderProcessHostImpl(
     BrowserContext* browser_context,
     StoragePartitionImpl* storage_partition_impl,
+    bool supports_browser_plugin,
     bool is_guest)
         : fast_shutdown_started_(false),
           deleting_soon_(false),
@@ -376,6 +377,7 @@ RenderProcessHostImpl::RenderProcessHostImpl(
 #if defined(OS_ANDROID)
           dummy_shutdown_event_(false, false),
 #endif
+          supports_browser_plugin_(supports_browser_plugin),

[Charlie Reis, 2013/03/21 01:09:39]

Can you add a CHECK(!is_guest || supports_browser_plugin)?

[Fady Samuel, 2013/03/21 02:51:13]

No, unfortunately.

is_guest does not imply supports_browser_plugin. The latter means that the
process is capable of hosting BrowserPlugins. The former means it's a guest
process. Guests cannot host other BrowserPlugins, at least for webviews.

           is_guest_(is_guest) {
   widget_helper_ = new RenderWidgetHelper();
 
@@ -529,11 +531,11 @@ void RenderProcessHostImpl::CreateMessageFilters() {
   MediaInternals* media_internals = MediaInternals::GetInstance();;
   // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
   // from guests.
-  // TODO(fsamuel): Call out to the ContentBrowserClient to decide whether or
-  // not to install the BrowserPluginMessageFilter.
-  scoped_refptr<BrowserPluginMessageFilter> bp_message_filter(
-      new BrowserPluginMessageFilter(GetID(), IsGuest()));
-  channel_->AddFilter(bp_message_filter);
+  if (supports_browser_plugin_) {
+    scoped_refptr<BrowserPluginMessageFilter> bp_message_filter(
+        new BrowserPluginMessageFilter(GetID(), IsGuest()));
+    channel_->AddFilter(bp_message_filter);
+  }
 
   scoped_refptr<RenderMessageFilter> render_message_filter(
       new RenderMessageFilter(