Merge 150875 - Disable captive portal detection for M22.

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 76 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_testing_ = false;
+// Disabled for M22.
+bool CaptivePortalService::is_disabled_for_testing_ = true;
 
 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:
@@ skipping 306 matching lines @@
 
 bool CaptivePortalService::FetchingURL() const {
   return url_fetcher_.get() != NULL;
 }
 
 bool CaptivePortalService::TimerRunning() const {
   return check_captive_portal_timer_.IsRunning();
 }
 
 }  // namespace captive_portal