Add custom interstitial for captive portals.

chrome/browser/captive_portal/captive_portal_service.h

Index: chrome/browser/captive_portal/captive_portal_service.h
diff --git a/chrome/browser/captive_portal/captive_portal_service.h b/chrome/browser/captive_portal/captive_portal_service.h
index 66e6d1b4182049e14af547361a2e04522fe8148f..5a93b84ac05d2f862d86c31beaf91aba7d8cd4b3 100644
--- a/chrome/browser/captive_portal/captive_portal_service.h
+++ b/chrome/browser/captive_portal/captive_portal_service.h
@@ -50,6 +50,9 @@ class CaptivePortalService : public KeyedService, public base::NonThreadSafe {
   // Always sends the result notification asynchronously.
   void DetectCaptivePortal();
 
+  // Enables or disables actual portal checks.
+  void SetPortalDetectionEnabledForTest(bool enabled);

[mmenke, 2014/12/09 22:42:26]

Having both this and set_state_for_testing seems a bit redundant.  Can we just
add a new TestingState?  IGNORE_REQUESTS_FOR_TESTING.  (FOR_TESTING is
redundant, but matches the others).

Should probably make it act like SKIP_OS_CHECK_FOR_TESTING as well, for
consistency, though you'll probably be setting it after the OS check, anyways.

[meacer, 2014/12/10 22:48:02]

I considered doing that previously but wasn't sure how it would work, given it's
not possible to combine testing states.
Added a new testing state now, with checks in the browser test to ensure that
setting the new state only occurs after SKIP_OS_CHECK_FOR_TESTING is set.

+
   // Returns the URL used for captive portal testing.  When a captive portal is
   // detected, this URL will take us to the captive portal landing page.
   const GURL& test_url() const { return test_url_; }
@@ -204,6 +207,9 @@ class CaptivePortalService : public KeyedService, public base::NonThreadSafe {
   // Test time ticks used by unit tests.
   base::TimeTicks time_ticks_for_testing_;
 
+  // If true, portal detection is enabled. Only false in tests.
+  bool portal_detection_enabled_;
+
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalService);
 };