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 196 matching lines @@
 
   UpdateEnabledState();
 }
 
 CaptivePortalService::~CaptivePortalService() {
 }
 
 void CaptivePortalService::DetectCaptivePortal() {
   DCHECK(CalledOnValidThread());
 
+  // Detection should be disabled only in tests.
+  if (testing_state_ == IGNORE_REQUESTS_FOR_TESTING)
+    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 121 matching lines @@
 
   backoff_entry_.reset(new RecheckBackoffEntry(this));
 }
 
 void CaptivePortalService::UpdateEnabledState() {
   DCHECK(CalledOnValidThread());
   bool enabled_before = enabled_;
   enabled_ = testing_state_ != DISABLED_FOR_TESTING &&
              resolve_errors_with_web_service_.GetValue();
 
   if (testing_state_ != SKIP_OS_CHECK_FOR_TESTING &&

[mmenke, 2014/12/15 20:46:08]

testing_state_ != SKIP_OS_CHECK_FOR_TESTING &&
testing_state_ != IGNORE_REQUESTS_FOR_TESTING &&

And a comment in the header that the latter implies the former.  Tests pass
without it, since we don't call UpdateEnabledState after setting the testing
state, but it's more robust against refactoring.

[meacer, 2014/12/16 01:23:19]

Done.

       ShouldDeferToNativeCaptivePortalDetection()) {
     enabled_ = false;
   }
 
   if (enabled_before == enabled_)
     return;
 
   // Clear data used for histograms.
   num_checks_with_same_result_ = 0;
   first_check_time_with_same_result_ = base::TimeTicks();
@@ skipping 21 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();
 }