Add a chrome://interstitials page.

chrome/browser/ssl/ssl_blocking_page.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/ssl/ssl_blocking_page.h"
 
 #include "base/build_time.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 204 matching lines @@
     }
   }
 }
 
 }  // namespace
 
 // Note that we always create a navigation entry with SSL errors.
 // No error happening loading a sub-resource triggers an interstitial so far.
 SSLBlockingPage::SSLBlockingPage(
     content::WebContents* web_contents,
+    bool create_interstitial,
     int cert_error,
     const net::SSLInfo& ssl_info,
     const GURL& request_url,
     bool overridable,
     bool strict_enforcement,
     const base::Callback<void(bool)>& callback)
     : callback_(callback),
       web_contents_(web_contents),
       cert_error_(cert_error),
       ssl_info_(ssl_info),
@@ skipping 36 matching lines @@
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
   CaptivePortalService* captive_portal_service =
       CaptivePortalServiceFactory::GetForProfile(profile);
   captive_portal_detection_enabled_ = captive_portal_service ->enabled();
   captive_portal_service ->DetectCaptivePortal();
   registrar_.Add(this,
                  chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
                  content::Source<Profile>(profile));
 #endif
 
-  interstitial_page_ = InterstitialPage::Create(
-      web_contents_, true, request_url, this);
-  interstitial_page_->Show();
+  // chrome://interstitials page uses this class without actually creating an
+  // interstitial so that it can be debugged. Set |create_interstitial| to true
+  // if the page is going to be used as an actual interstitial and not just part
+  // of the chrome://interstitials webui.
+  if (create_interstitial) {
+    interstitial_page_ = InterstitialPage::Create(
+        web_contents_, true, request_url, this);
+    interstitial_page_->Show();
+  }
 }
 
 SSLBlockingPage::~SSLBlockingPage() {
   if (!callback_.is_null()) {
     RecordSSLBlockingPageDetailedStats(false,
                                        cert_error_,
                                        overridable_ && !strict_enforcement_,
                                        internal_,
                                        num_visits_,
                                        captive_portal_detection_enabled_,
                                        captive_portal_probe_completed_,
                                        captive_portal_no_response_,
                                        captive_portal_detected_);
     // The page is closed without the user having chosen what to do, default to
     // deny.
     NotifyDenyCertificate();
   }
 }
 
+// static
+void SSLBlockingPage::Show(content::WebContents* web_contents,
+                           int cert_error,
+                           const net::SSLInfo& ssl_info,
+                           const GURL& request_url,
+                           bool overridable,
+                           bool strict_enforcement,
+                           const base::Callback<void(bool)>& callback) {
+  // The interstitial created by the blocking page owns the blocking page.
+  new SSLBlockingPage(web_contents,
+                      true,

[Bernhard Bauer, 2014/07/16 21:49:59]

What I meant was that you could show it from here, then you don't need that
parameter?

[meacer, 2014/07/17 21:24:09]

Done.

+                      cert_error,
+                      ssl_info,
+                      request_url,
+                      overridable,
+                      strict_enforcement,
+                      callback);
+}
+
+// static
+SSLBlockingPage* SSLBlockingPage::CreateForWebUI(
+    content::WebContents* web_contents,
+    int cert_error,
+    const net::SSLInfo& ssl_info,
+    const GURL& request_url,
+    bool overridable,
+    bool strict_enforcement) {
+  // The callee owns the blocking page.

[Bernhard Bauer, 2014/07/16 21:49:59]

This comment would be better off in the header. But could you just make this
return a scoped_ptr? Then it would be implied anyway.

[meacer, 2014/07/17 21:24:09]

Returning scoped_ptr makes the code slightly more complicated (for consistency
SafeBrowsingBlockingPage::CreateBlockingPage would return a scoped_ptr as well
and that introduces more code changes). So I'll keep it as a raw pointer.

+  return new SSLBlockingPage(web_contents,
+                             false,
+                             cert_error,
+                             ssl_info,
+                             request_url,
+                             overridable,
+                             strict_enforcement,
+                             base::Callback<void(bool)>());
+}
+
 std::string SSLBlockingPage::GetHTMLContents() {
   if (trial_condition_ == kCondV1 || trial_condition_ == kCondV1LayoutV2Text)
     return GetHTMLContentsV1();
   return GetHTMLContentsV2();
 }
 
 std::string SSLBlockingPage::GetHTMLContentsV1() {
   base::DictionaryValue strings;
   int resource_id;
   if (overridable_ && !strict_enforcement_) {
@@ skipping 408 matching lines @@
     // sure we don't clear the captive portal flag, since the interstitial was
     // potentially caused by the captive portal.
     captive_portal_detected_ = captive_portal_detected_ ||
         (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
     // Also keep track of non-HTTP portals and error cases.
     captive_portal_no_response_ = captive_portal_no_response_ ||
         (results->result == captive_portal::RESULT_NO_RESPONSE);
   }
 #endif
 }