Revert of 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 344 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
 
-  // 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.
   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) {
-  SSLBlockingPage* ssl_blocking_page = new SSLBlockingPage(web_contents,
-                                                           cert_error,
-                                                           ssl_info,
-                                                           request_url,
-                                                           overridable,
-                                                           strict_enforcement,
-                                                           callback);
-  ssl_blocking_page->interstitial_page_->Show();
-}
-
-// 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) {
-  return new SSLBlockingPage(web_contents,
-                             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 414 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
 }