Add custom interstitial for captive portals.

chrome/browser/captive_portal/captive_portal_service.cc

Index: chrome/browser/captive_portal/captive_portal_service.cc
diff --git a/chrome/browser/captive_portal/captive_portal_service.cc b/chrome/browser/captive_portal/captive_portal_service.cc
index 93c37a8c1b81f69c8f9c174e934e7a1276f8a3bd..d38611749b65393deeba27491be589f4c3cebece 100644
--- a/chrome/browser/captive_portal/captive_portal_service.cc
+++ b/chrome/browser/captive_portal/captive_portal_service.cc
@@ -214,6 +214,10 @@ 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;
@@ -356,6 +360,7 @@ void CaptivePortalService::UpdateEnabledState() {
              resolve_errors_with_web_service_.GetValue();
 
   if (testing_state_ != SKIP_OS_CHECK_FOR_TESTING &&
+      testing_state_ != IGNORE_REQUESTS_FOR_TESTING &&
       ShouldDeferToNativeCaptivePortalDetection()) {
     enabled_ = false;
   }