Add type for testing to interstitials.

chrome/browser/captive_portal/captive_portal_browsertest.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 <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 882 matching lines @@
 
   // Sets up the captive portal service for the given profile so that
   // all checks go to |test_url|.  Also disables all timers.
   void SetUpCaptivePortalService(Profile* profile, const GURL& test_url);
 
   // Returns true if |browser|'s profile is currently running a captive portal
   // check.
   bool CheckPending(Browser* browser);
 
   // Returns the type of the interstitial being shown.
-  const void* GetInterstitialType(WebContents* contents) const;
+  content::InterstitialPageDelegate::TypeID GetInterstitialType(
+      WebContents* contents) const;
 
   // Returns the CaptivePortalTabReloader::State of |web_contents|.
   CaptivePortalTabReloader::State GetStateOfTabReloader(
       WebContents* web_contents) const;
 
   // Returns the CaptivePortalTabReloader::State of the indicated tab.
   CaptivePortalTabReloader::State GetStateOfTabReloaderAt(Browser* browser,
                                                           int index) const;
 
   // Returns the number of tabs with the given state, across all profiles.
@@ skipping 221 matching lines @@
 }
 
 bool CaptivePortalBrowserTest::CheckPending(Browser* browser) {
   CaptivePortalService* captive_portal_service =
       CaptivePortalServiceFactory::GetForProfile(browser->profile());
 
   return captive_portal_service->DetectionInProgress() ||
       captive_portal_service->TimerRunning();
 }
 
-const void* CaptivePortalBrowserTest::GetInterstitialType(
-    WebContents* contents) const {
+content::InterstitialPageDelegate::TypeID
+CaptivePortalBrowserTest::GetInterstitialType(WebContents* contents) const {
   if (!contents->ShowingInterstitialPage())
     return nullptr;
-  SecurityInterstitialPage* blocking_page =
-      static_cast<SecurityInterstitialPage*>(
-          contents->GetInterstitialPage()->GetDelegateForTesting());
-  return blocking_page->GetTypeForTesting();
+  return contents->GetInterstitialPage()
+      ->GetDelegateForTesting()
+      ->GetTypeForTesting();
 }
 
 CaptivePortalTabReloader::State CaptivePortalBrowserTest::GetStateOfTabReloader(
     WebContents* web_contents) const {
   return GetTabReloader(web_contents)->state();
 }
 
 CaptivePortalTabReloader::State
 CaptivePortalBrowserTest::GetStateOfTabReloaderAt(Browser* browser,
                                                   int index) const {
@@ skipping 1567 matching lines @@
 
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             GetStateOfTabReloaderAt(browser(), broken_tab_index));
 
   WaitForInterstitialAttach(broken_tab_contents);
   portal_observer.WaitForResults(1);
 
   EXPECT_EQ(SSLBlockingPage::kTypeForTesting,
             GetInterstitialType(broken_tab_contents));
 }