Android: Remove more unneeded bits.

chrome/browser/extensions/chrome_extension_host_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/chrome_extension_host_delegate.h"
 
-#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
 
+// TODO(thestig): Remove #ifdefs when extensions is disabled on mobile.
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
+#endif
+
 namespace extensions {
 
 ChromeExtensionHostDelegate::ChromeExtensionHostDelegate() {}
 
 ChromeExtensionHostDelegate::~ChromeExtensionHostDelegate() {}
 
 void ChromeExtensionHostDelegate::OnExtensionHostCreated(
     content::WebContents* web_contents) {
+#if defined(ENABLE_EXTENSIONS)
   ChromeExtensionWebContentsObserver::CreateForWebContents(web_contents);

[not at google - send to devlin, 2014/07/08 15:18:14]

there is going to be a lot of this. would it make sense to have some utility
like "CreateForWebContentsIfSupported" which does nothing on Android (and use
that basically everywhere).

[Lei Zhang, 2014/07/08 20:41:13]

There are many, but a good percentage of them are in code that's not being
built, and most of the rest have been ifdefed already. This is in fact the last
one that I need to ifdef out.

+#endif
   PrefsTabHelper::CreateForWebContents(web_contents);
 }
 
 void ChromeExtensionHostDelegate::OnRenderViewCreatedForBackgroundPage(
     ExtensionHost* host) {
   ExtensionService* service =
       ExtensionSystem::Get(host->browser_context())->extension_service();
   if (service)
     service->DidCreateRenderViewForBackgroundPage(host);
 }
@@ skipping 15 matching lines @@
 void ChromeExtensionHostDelegate::ProcessMediaAccessRequest(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback,
     const Extension* extension) {
   MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
       web_contents, request, callback, extension);
 }
 
 }  // namespace extensions