Add custom interstitial for captive portals.

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/bind_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 176 matching lines @@
   backoff_policy.always_use_initial_delay = true;
 }
 
 CaptivePortalService::CaptivePortalService(Profile* profile)
     : profile_(profile),
       state_(STATE_IDLE),
       captive_portal_detector_(profile->GetRequestContext()),
       enabled_(false),
       last_detection_result_(captive_portal::RESULT_INTERNET_CONNECTED),
       num_checks_with_same_result_(0),
-      test_url_(captive_portal::CaptivePortalDetector::kDefaultURL) {
+      test_url_(captive_portal::CaptivePortalDetector::kDefaultURL),
+      portal_detection_enabled_(true) {
   // The order matters here:
   // |resolve_errors_with_web_service_| must be initialized and |backoff_entry_|
   // created before the call to UpdateEnabledState.
   resolve_errors_with_web_service_.Init(
       prefs::kAlternateErrorPagesEnabled,
       profile_->GetPrefs(),
       base::Bind(&CaptivePortalService::UpdateEnabledState,
                  base::Unretained(this)));
   ResetBackoffEntry(last_detection_result_);
 
   UpdateEnabledState();
 }
 
 CaptivePortalService::~CaptivePortalService() {
 }
 
+void CaptivePortalService::SetPortalDetectionEnabledForTest(bool enabled) {
+  portal_detection_enabled_ = enabled;
+}
+
 void CaptivePortalService::DetectCaptivePortal() {
   DCHECK(CalledOnValidThread());
 
+  // Detection should be disabled only in tests.
+  if (!portal_detection_enabled_)
+    return;
+
   // If a request is pending or running, do nothing.
   if (state_ == STATE_CHECKING_FOR_PORTAL || state_ == STATE_TIMER_RUNNING)
     return;
 
   base::TimeDelta time_until_next_check = backoff_entry_->GetTimeUntilRelease();
 
   // Start asynchronously.
   state_ = STATE_TIMER_RUNNING;
   check_captive_portal_timer_.Start(
       FROM_HERE,
@@ skipping 163 matching lines @@
     return time_ticks_for_testing_;
 }
 
 bool CaptivePortalService::DetectionInProgress() const {
   return state_ == STATE_CHECKING_FOR_PORTAL;
 }
 
 bool CaptivePortalService::TimerRunning() const {
   return check_captive_portal_timer_.IsRunning();
 }