Add custom interstitial for captive portals.

chrome/browser/ssl/captive_portal_blocking_page.h

+// Copyright 2014 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_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_
+#define CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_
+
+#include <string>
+
+#include "base/callback.h"
+#include "base/macros.h"
+#include "chrome/browser/interstitials/security_interstitial_page.h"
+
+class GURL;
+
+namespace content{
+class WebContents;
+}
+
+// This class is responsible for showing/hiding the interstitial page that is
+// shown when a captive portal and an SSL error is detected.

[felt, 2014/12/28 15:40:52]

nit: "...that is shown when a captive portal triggers an SSL error" (or similar)

[meacer, 2015/01/08 14:29:16]

Done.

+// It deletes itself when the interstitial page is closed.
+//
+// This class should only be used on the UI thread because its implementation
+// uses captive_portal::CaptivePortalService, which can only be accessed on the
+// UI thread. Only used when ENABLE_CAPTIVE_PORTAL_DETECTION is true.
+class CaptivePortalBlockingPage : public SecurityInterstitialPage {
+ public:
+  // Interstitial type, for testing.
+  static const void* kTypeForTesting;

[felt, 2014/12/28 15:40:52]

If this is only for testing, can it be protected or private w/ some friend
classes? Same goes for GetTypeForTesting() below.

[meacer, 2015/01/08 14:29:16]

If we do this, then we should do the same for SSLBlockingPage and
SafeBrowsingBlockingPage as well. Do you mind if I do this in a later CL?

As for GetTypeForTesting, we want it to be available in the
SecurityInterstitialPage interface so that we can check the type without having
to cast the interstitial page.

[felt, 2015/01/08 16:47:44]

Yeah, no need to do it here but I generally think anything ForTesting should be
protected. (Can't make it private but protected should work right?)

[Bernhard Bauer, 2015/01/08 17:25:13]

If you actually name it ...ForTesting, there's a presubmit check that makes sure
you only call it from testing code.

+
+  CaptivePortalBlockingPage(content::WebContents* web_contents,
+                            const GURL& request_url,
+                            const base::Callback<void(bool)>& callback);
+  ~CaptivePortalBlockingPage() override;
+
+  // SecurityInterstitialPage method:
+  const void* GetTypeForTesting() const override;
+
+ protected:
+  // SecurityInterstitialPage methods:
+  void PopulateInterstitialStrings(
+      base::DictionaryValue* load_time_data) override;
+  bool ShouldCreateNewNavigation() const override;
+
+  // InterstitialPageDelegate method:
+  void CommandReceived(const std::string& command) override;
+
+ private:
+  base::Callback<void(bool)> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(CaptivePortalBlockingPage);
+};
+
+#endif  // CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_