Exclude PluginService for builds with enable_plugins==0

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 048317366feedae14d7e02c01a48a667eedf2b6c..26c31f3c908c2af56d3923447e9c17515b2f7578 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1874,6 +1874,7 @@ WebExternalPopupMenu* RenderViewImpl::createExternalPopupMenu(
 
 RenderWidgetFullscreenPepper* RenderViewImpl::CreatePepperFullscreenContainer(
     webkit::ppapi::PluginInstance* plugin) {
+#if defined(ENABLE_PLUGINS)
   GURL active_url;
   if (webview() && webview()->mainFrame())
     active_url = GURL(webview()->mainFrame()->document().url());
@@ -1881,6 +1882,9 @@ RenderWidgetFullscreenPepper* RenderViewImpl::CreatePepperFullscreenContainer(
       routing_id_, plugin, active_url, screen_info_);
   widget->show(WebKit::WebNavigationPolicyIgnore);
   return widget;
+#else  // defined(ENABLE_PLUGINS)
+  return NULL;

[stuartmorgan, 2012/12/19 12:53:58]

Shouldn't these functions both have a NOTREACHED() as well?

[nilesh, 2012/12/19 21:07:44]

Added NOTREACHED here. 
RenderViewImpl::createPlugin is implementing Webkit::WebFrameClient which is
called and is expected to return NULL.

+#endif
 }
 
 WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace(
@@ -2506,6 +2510,9 @@ void RenderViewImpl::didActivateCompositor(int input_handler_identifier) {
 
 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
                                         const WebPluginParams& params) {
+#if !defined(ENABLE_PLUGINS)

[jam, 2012/12/19 01:55:15]

nit: can you flip the order here so that it's easier to read?

[nilesh, 2012/12/19 21:07:44]

Done.

+  return NULL;
+#else
   WebPlugin* plugin = NULL;
   if (GetContentClient()->renderer()->OverrideCreatePlugin(
           this, frame, params, &plugin)) {
@@ -2526,6 +2533,7 @@ WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
   WebPluginParams params_to_use = params;
   params_to_use.mimeType = WebString::fromUTF8(mime_type);
   return CreatePlugin(frame, info, params_to_use);
+#endif
 }
 
 WebSharedWorker* RenderViewImpl::createSharedWorker(