Enable captive portal detection by default.

chrome/test/base/in_process_browser_test.cc

Index: chrome/test/base/in_process_browser_test.cc
===================================================================
--- chrome/test/base/in_process_browser_test.cc	(revision 148558)
+++ chrome/test/base/in_process_browser_test.cc	(working copy)
@@ -14,6 +14,7 @@
 #include "base/string_number_conversions.h"
 #include "base/test/test_file_util.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
@@ -145,6 +146,11 @@
   // time code is directly executed.
   autorelease_pool_ = new base::mac::ScopedNSAutoreleasePool;
 #endif
+
+#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+  captive_portal::CaptivePortalService::set_is_disabled_for_testing(true);
+#endif
+
   BrowserTestBase::SetUp();
 }
 
@@ -175,8 +181,8 @@
   command_line->AppendSwitch(switches::kDisableZeroBrowsersOpenForTests);
 
   if (!command_line->HasSwitch(switches::kHomePage)) {
-      command_line->AppendSwitchASCII(
-          switches::kHomePage, chrome::kAboutBlankURL);
+    command_line->AppendSwitchASCII(
+        switches::kHomePage, chrome::kAboutBlankURL);
   }
   if (command_line->GetArgs().empty())
     command_line->AppendArg(chrome::kAboutBlankURL);