Added CaptivePortal Interstitial to chrome://interstitials

chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

 // Copyright 2015 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/captive_portal_blocking_page.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 112 matching lines @@
   FakeConnectionInfoDelegate* delegate =
       new FakeConnectionInfoDelegate(is_wifi_connection, wifi_ssid);
   net::SSLInfo ssl_info;
   ssl_info.cert = new net::X509Certificate(
       login_url.host(), "CA", base::Time::Max(), base::Time::Max());
 
   // Blocking page is owned by the interstitial.
   CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
       contents, GURL(kBrokenSSL), login_url, ssl_cert_reporter.Pass(), ssl_info,
       base::Callback<void(bool)>());
-  blocking_page->SetDelegateForTesting(delegate);
+  blocking_page->SetDelegate(delegate);
   blocking_page->Show();
 
   WaitForInterstitialAttach(contents);
   EXPECT_TRUE(
       WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
   EXPECT_EQ(expect_wifi == EXPECT_WIFI_YES,
             IsInterstitialDisplayingText(contents->GetInterstitialPage(),
                                          "Wi-Fi"));
   if (!wifi_ssid.empty()) {
     EXPECT_EQ(expect_wifi_ssid == EXPECT_WIFI_SSID_YES,
@@ skipping 154 matching lines @@
       content::WebContents* contents,
       const GURL& request_url) const override {
     // Delegate is owned by the blocking page.
     FakeConnectionInfoDelegate* delegate =
         new FakeConnectionInfoDelegate(false, std::string());
     net::SSLInfo empty_ssl_info;
     // Blocking page is owned by the interstitial.
     CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
         contents, GURL(kBrokenSSL), request_url, nullptr, empty_ssl_info,
         base::Callback<void(bool)>());
-    blocking_page->SetDelegateForTesting(delegate);
+    blocking_page->SetDelegate(delegate);
     return blocking_page;
   }
 };
 
 // Test that an IDN login domain is decoded properly.
 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageIDNTest,
                        ShowLoginIDNIfPortalRedirectsDetectionURL) {
   EXPECT_TRUE(VerifyIDNDecoded());
 }