Enable captive portal detection by default.

chrome/browser/captive_portal/captive_portal_service.cc

 // Copyright (c) 2012 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/captive_portal/captive_portal_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 308 matching lines @@
   } else {
     recheck_policy_.backoff_policy.initial_delay_ms =
         recheck_policy_.initial_backoff_no_portal_ms;
   }
 
   backoff_entry_.reset(new RecheckBackoffEntry(this));
 }
 
 void CaptivePortalService::UpdateEnabledState() {
   bool enabled_before = enabled_;
-  enabled_ = resolve_errors_with_web_service_.GetValue() &&
-             CommandLine::ForCurrentProcess()->HasSwitch(
-                 switches::kCaptivePortalDetection);
+
+  // Default value.
+  bool allowed_by_command_line = true;
+
+  std::string command_line_value =
+      CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kCaptivePortalDetection);
+  if (command_line_value == switches::kCaptivePortalDetectionDisabled) {
+    allowed_by_command_line = false;
+  } else if (command_line_value == switches::kCaptivePortalDetectionEnabled) {
+    allowed_by_command_line = true;
+  }
+
+  enabled_ = allowed_by_command_line &&
+             resolve_errors_with_web_service_.GetValue();
   if (enabled_before == enabled_)
     return;
 
   // Clear data used for histograms.
   num_checks_with_same_result_ = 0;
   first_check_time_with_same_result_ = base::TimeTicks();
   last_check_time_ = base::TimeTicks();
 
   ResetBackoffEntry(last_detection_result_);
 
@@ skipping 72 matching lines @@
 
 bool CaptivePortalService::FetchingURL() const {
   return url_fetcher_.get() != NULL;
 }
 
 bool CaptivePortalService::TimerRunning() const {
   return check_captive_portal_timer_.IsRunning();
 }
 
 }  // namespace captive_portal