ifdef extensions code in BrowserProcess, IOThread, and ChromeNetworkDelegate.

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 27b7c5be0d5e0e6cce3a5077219abbcc0efb88f7..c64c1121c481f5708733970cc69c6c250b1c031f 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -36,8 +36,6 @@
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/download/download_status_updater.h"
 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
-#include "chrome/browser/extensions/event_router_forwarder.h"
-#include "chrome/browser/extensions/extension_renderer_state.h"
 #include "chrome/browser/first_run/upgrade_util.h"
 #include "chrome/browser/gpu/gl_string_manager.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
@@ -113,11 +111,6 @@
 #include "components/gcm_driver/gcm_client_factory.h"
 #endif
 
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
-#include "chrome/browser/media_galleries/media_file_system_registry.h"
-#include "components/storage_monitor/storage_monitor.h"
-#endif
-
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
 #endif
@@ -128,6 +121,13 @@
 #include "components/policy/core/common/policy_service_stub.h"
 #endif  // defined(ENABLE_CONFIGURATION_POLICY)
 
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/extensions/event_router_forwarder.h"
+#include "chrome/browser/extensions/extension_renderer_state.h"
+#include "chrome/browser/media_galleries/media_file_system_registry.h"
+#include "components/storage_monitor/storage_monitor.h"
+#endif
+
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #include "chrome/browser/plugins/plugins_resource_service.h"
 #endif
@@ -192,6 +192,9 @@ BrowserProcessImpl::BrowserProcessImpl(
 
 #if defined(ENABLE_EXTENSIONS)
   apps::AppsClient::Set(ChromeAppsClient::GetInstance());
+
+  extension_event_router_forwarder_ = new extensions::EventRouterForwarder;
+  ExtensionRendererState::GetInstance()->Init();

[Ryan Sleevi, 2014/07/16 20:23:43]

What are the implications now with respect to startup? It's hard to know whether
the original ordering was intentional or not, especially given that these bits
(200-205) are touching extensions as well, and set the client before the
forwarder.

[Lei Zhang, 2014/07/18 01:34:24]

I believe this to be ok, but I can loop in someone on the extensions-side to
verify.

 #endif
 
   extensions::ExtensionsClient::Set(
@@ -201,9 +204,6 @@ BrowserProcessImpl::BrowserProcessImpl(
       new extensions::ChromeExtensionsBrowserClient);
   extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
 
-  extension_event_router_forwarder_ = new extensions::EventRouterForwarder;
-  ExtensionRendererState::GetInstance()->Init();
-
   message_center::MessageCenter::Initialize();
 
   omaha_query_params::OmahaQueryParams::SetDelegate(
@@ -252,9 +252,9 @@ void BrowserProcessImpl::StartTearDown() {
   remote_debugging_server_.reset();
 #endif
 
+#if defined(ENABLE_EXTENSIONS)
   ExtensionRendererState::GetInstance()->Shutdown();
 
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
   media_file_system_registry_.reset();
   // Remove the global instance of the Storage Monitor now. Otherwise the
   // FILE thread would be gone when we try to release it in the dtor and
@@ -560,7 +560,11 @@ BrowserProcessPlatformPart* BrowserProcessImpl::platform_part() {
 
 extensions::EventRouterForwarder*
 BrowserProcessImpl::extension_event_router_forwarder() {
+#if defined(ENABLE_EXTENSIONS)
   return extension_event_router_forwarder_.get();
+#else
+  return NULL;
+#endif
 }
 
 NotificationUIManager* BrowserProcessImpl::notification_ui_manager() {
@@ -953,8 +957,14 @@ void BrowserProcessImpl::CreateLocalState() {
 }
 
 void BrowserProcessImpl::PreCreateThreads() {
-  io_thread_.reset(new IOThread(local_state(), policy_service(), net_log_.get(),
-                                extension_event_router_forwarder_.get()));
+  io_thread_.reset(
+      new IOThread(local_state(), policy_service(), net_log_.get(),
+#if defined(ENABLE_EXTENSIONS)
+                   extension_event_router_forwarder_.get()
+#else
+                   NULL
+#endif

[Ryan Sleevi, 2014/07/16 20:23:43]

Prefer to stuff this in a member variable (wrapped in #ifdef) and then pass that
variable unconditionally


extensions::EventRouterForwarder* event_router_forwarder = NULL;
#if defined(ENABLE_EXTENSIONS)
event_router_forwarder = extension_event_router_forwarder_.get();
#endif
new IOThread ...


Of course, even this is unnecessary, as you could just call
extension_event_router_forwarder(), which already does the right #ifdef dance.

[Lei Zhang, 2014/07/18 01:34:24]

Done.

+                   ));  // NOLINT
 }
 
 void BrowserProcessImpl::PreMainMessageLoopRun() {