Add custom interstitial for captive portals.

chrome/browser/captive_portal/captive_portal_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_member.h"
@@ skipping 32 matching lines @@
   };
 
   explicit CaptivePortalService(Profile* profile);
   ~CaptivePortalService() override;
 
   // Triggers a check for a captive portal.  If there's already a check in
   // progress, does nothing.  Throttles the rate at which requests are sent.
   // 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_; }
 
   // Result of the most recent captive portal check.
   captive_portal::CaptivePortalResult last_detection_result() const {
     return last_detection_result_;
   }
 
   // Whether or not the CaptivePortalService is enabled.  When disabled, all
@@ skipping 134 matching lines @@
   // the Link Doctor.
   BooleanPrefMember resolve_errors_with_web_service_;
 
   base::OneShotTimer<CaptivePortalService> check_captive_portal_timer_;
 
   static TestingState testing_state_;
 
   // 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);
 };
 
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_