Add PluginServiceStub for builds with enable_plugins==0

content/browser/renderer_host/render_message_filter.cc

Index: content/browser/renderer_host/render_message_filter.cc
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 0823310897e723e7b076dd8c4b8d6ebaa3a5df2b..9ef28047b99dd1aa90101acb5f6df1690f9166ba 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -329,6 +329,7 @@ RenderMessageFilter::~RenderMessageFilter() {
 
 void RenderMessageFilter::OnChannelClosing() {
   BrowserMessageFilter::OnChannelClosing();
+#if defined(ENABLE_PLUGINS)
   for (std::set<OpenChannelToNpapiPluginCallback*>::iterator it =
        plugin_host_clients_.begin(); it != plugin_host_clients_.end(); ++it) {
     OpenChannelToNpapiPluginCallback* client = *it;
@@ -343,6 +344,7 @@ void RenderMessageFilter::OnChannelClosing() {
     }
     client->Cancel();
   }
+#endif
   plugin_host_clients_.clear();
 }
 
@@ -383,9 +385,9 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message,
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetPlugins, OnGetPlugins)
     IPC_MESSAGE_HANDLER(ViewHostMsg_GetPluginInfo, OnGetPluginInfo)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DownloadUrl, OnDownloadUrl)
+#if defined(ENABLE_PLUGINS)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_OpenChannelToPlugin,
                                     OnOpenChannelToPlugin)
-#if defined(ENABLE_PLUGINS)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_OpenChannelToPepperPlugin,
                                     OnOpenChannelToPepperPlugin)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidCreateOutOfProcessPepperInstance,
@@ -636,12 +638,12 @@ void RenderMessageFilter::OnGetPlugins(
     const base::TimeTicks now = base::TimeTicks::Now();
     if (now - last_plugin_refresh_time_ >= threshold) {
       // Only refresh if the threshold hasn't been exceeded yet.
-      PluginServiceImpl::GetInstance()->RefreshPlugins();
+      PluginService::GetInstance()->RefreshPlugins();
       last_plugin_refresh_time_ = now;
     }
   }
 
-  PluginServiceImpl::GetInstance()->GetPlugins(
+  PluginService::GetInstance()->GetPlugins(
       base::Bind(&RenderMessageFilter::GetPluginsCallback, this, reply_msg));
 }
 
@@ -649,7 +651,7 @@ void RenderMessageFilter::GetPluginsCallback(
     IPC::Message* reply_msg,
     const std::vector<webkit::WebPluginInfo>& all_plugins) {
   // Filter the plugin list.
-  PluginServiceFilter* filter = PluginServiceImpl::GetInstance()->GetFilter();
+  PluginServiceFilter* filter = PluginService::GetInstance()->GetFilter();
   std::vector<webkit::WebPluginInfo> plugins;
 
   int child_process_id = -1;