Enable captive portal detection by default.

chrome/browser/captive_portal/captive_portal_browsertest.cc

Index: chrome/browser/captive_portal/captive_portal_browsertest.cc
===================================================================
--- chrome/browser/captive_portal/captive_portal_browsertest.cc	(revision 148558)
+++ chrome/browser/captive_portal/captive_portal_browsertest.cc	(working copy)
@@ -761,7 +761,6 @@
   CaptivePortalBrowserTest();
 
   // InProcessBrowserTest:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
   virtual void SetUpOnMainThread() OVERRIDE;
   virtual void CleanUpOnMainThread() OVERRIDE;
 
@@ -898,6 +897,11 @@
       base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
   URLRequestMockCaptivePortalJobFactory::AddUrlHandlers();
 
+  // Double-check that the captive portal service isn't enabled by default for
+  // browser tests.
+  EXPECT_TRUE(CaptivePortalService::is_disabled_for_testing());
+
+  CaptivePortalService::set_is_disabled_for_testing(false);
   EnableCaptivePortalDetection(browser()->profile(), true);
 
   // Set the captive portal service to use URLRequestMockCaptivePortalJob's
@@ -911,11 +915,6 @@
   EXPECT_FALSE(CheckPending(browser()));
 }
 
-void CaptivePortalBrowserTest::SetUpCommandLine(
-    CommandLine* command_line) {
-  command_line->AppendSwitch(switches::kCaptivePortalDetection);
-}
-
 void CaptivePortalBrowserTest::EnableCaptivePortalDetection(
     Profile* profile, bool enabled) {
   profile->GetPrefs()->SetBoolean(prefs::kAlternateErrorPagesEnabled, enabled);