ifdef extensions code in BrowserProcess, IOThread, and ChromeNetworkDelegate.

chrome/browser/net/chrome_network_delegate_unittest.cc

Index: chrome/browser/net/chrome_network_delegate_unittest.cc
diff --git a/chrome/browser/net/chrome_network_delegate_unittest.cc b/chrome/browser/net/chrome_network_delegate_unittest.cc
index 75144be12721c84d7311de950fcde54b8d4e6762..e8efb070d18ca9aeffa4170141e34ad686702998 100644
--- a/chrome/browser/net/chrome_network_delegate_unittest.cc
+++ b/chrome/browser/net/chrome_network_delegate_unittest.cc
@@ -9,7 +9,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_member.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
-#include "chrome/browser/extensions/event_router_forwarder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
@@ -21,6 +20,11 @@
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/extensions/event_router_forwarder.h"
+#endif
+
+#if defined(ENABLE_EXTENSIONS)
 class ChromeNetworkDelegateTest : public testing::Test {
  protected:
   ChromeNetworkDelegateTest()
@@ -88,12 +92,15 @@ class ChromeNetworkDelegateTest : public testing::Test {
 TEST_F(ChromeNetworkDelegateTest, NeverThrottleLogic) {
   NeverThrottleLogicImpl();
 }
+#endif  // defined(ENABLE_EXTENSIONS)
 
 class ChromeNetworkDelegateSafeSearchTest : public testing::Test {
  public:
   ChromeNetworkDelegateSafeSearchTest()
-      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
-        forwarder_(new extensions::EventRouterForwarder()) {
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {
+#if defined(ENABLE_EXTENSIONS)
+    forwarder_ = new extensions::EventRouterForwarder();
+#endif
   }
 
   virtual void SetUp() OVERRIDE {
@@ -105,7 +112,13 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test {
  protected:
   scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate() {
     scoped_ptr<ChromeNetworkDelegate> network_delegate(
-        new ChromeNetworkDelegate(forwarder_.get(), &enable_referrers_));
+        new ChromeNetworkDelegate(
+#if defined(ENABLE_EXTENSIONS)
+            forwarder_.get(),
+#else
+            NULL,
+#endif

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

Wrap this into a fixture helper?

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

Done.

+            &enable_referrers_));
     network_delegate->set_force_google_safe_search(&force_google_safe_search_);
     return network_delegate.PassAs<net::NetworkDelegate>();
   }
@@ -138,7 +151,9 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test {
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
+#if defined(ENABLE_EXTENSIONS)
   scoped_refptr<extensions::EventRouterForwarder> forwarder_;
+#endif
   TestingProfile profile_;
   BooleanPrefMember enable_referrers_;
   BooleanPrefMember force_google_safe_search_;
@@ -285,7 +300,9 @@ class ChromeNetworkDelegatePrivacyModeTest : public testing::Test {
  public:
   ChromeNetworkDelegatePrivacyModeTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
+#if defined(ENABLE_EXTENSIONS)
         forwarder_(new extensions::EventRouterForwarder()),
+#endif
         cookie_settings_(CookieSettings::Factory::GetForProfile(&profile_)
                              .get()),
         kBlockedSite("http://ads.thirdparty.com"),
@@ -302,7 +319,13 @@ class ChromeNetworkDelegatePrivacyModeTest : public testing::Test {
  protected:
   scoped_ptr<ChromeNetworkDelegate> CreateNetworkDelegate() {
     scoped_ptr<ChromeNetworkDelegate> network_delegate(
-        new ChromeNetworkDelegate(forwarder_.get(), &enable_referrers_));
+        new ChromeNetworkDelegate(
+#if defined(ENABLE_EXTENSIONS)
+            forwarder_.get(),
+#else
+            NULL,
+#endif
+            &enable_referrers_));
     network_delegate->set_cookie_settings(cookie_settings_);
     return network_delegate.Pass();
   }
@@ -314,7 +337,9 @@ class ChromeNetworkDelegatePrivacyModeTest : public testing::Test {
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
+#if defined(ENABLE_EXTENSIONS)
   scoped_refptr<extensions::EventRouterForwarder> forwarder_;
+#endif
   TestingProfile profile_;
   CookieSettings* cookie_settings_;
   BooleanPrefMember enable_referrers_;