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"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
 namespace captive_portal {
 
 namespace {
@@ skipping 61 matching lines @@
               CaptivePortalResultToString(result),
           base::TimeDelta::FromSeconds(1),  // min
           base::TimeDelta::FromHours(1),  // max
           50,  // bucket_count
           base::Histogram::kUmaTargetedHistogramFlag);
   result_duration_histogram->AddTime(result_duration);
 }
 
 }  // namespace
 
+bool CaptivePortalService::is_disabled_for_tests_ = false;
+
 class CaptivePortalService::RecheckBackoffEntry : public net::BackoffEntry {
  public:
   explicit RecheckBackoffEntry(CaptivePortalService* captive_portal_service)
       : net::BackoffEntry(
             &captive_portal_service->recheck_policy().backoff_policy),
         captive_portal_service_(captive_portal_service) {
   }
 
  private:
   virtual base::TimeTicks ImplGetTimeNow() const OVERRIDE {
@@ skipping 211 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);
+  enabled_ = !is_disabled_for_tests_ &&
+             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