Add type for testing to interstitials.

chrome/browser/ssl/ssl_blocking_page.h

 // 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.
 
 #ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 39 matching lines @@
     // Indicates whether or not the site the user is trying to connect to has
     // requested strict enforcement of certificate validation (e.g. with HTTP
     // Strict-Transport-Security).
     STRICT_ENFORCEMENT = 1 << 1,
     // Indicates whether a user decision had been previously made but the
     // decision has expired.
     EXPIRED_BUT_PREVIOUSLY_ALLOWED = 1 << 2
   };
 
   // Interstitial type, used in tests.
-  static const void* kTypeForTesting;
+  static InterstitialPageDelegate::TypeID kTypeForTesting;
 
   ~SSLBlockingPage() override;
 
   // Creates an SSL blocking page. If the blocking page isn't shown, the caller
   // is responsible for cleaning up the blocking page, otherwise the
   // interstitial takes ownership when shown. |options_mask| must be a bitwise
   // mask of SSLBlockingPageOptionsMask values.
   SSLBlockingPage(content::WebContents* web_contents,
                   int cert_error,
                   const net::SSLInfo& ssl_info,
                   const GURL& request_url,
                   int options_mask,
                   const base::Time& time_triggered,
                   const base::Callback<void(bool)>& callback);
 
-  // SecurityInterstitialPage method:
-  const void* GetTypeForTesting() const override;
+  // InterstitialPageDelegate method:
+  InterstitialPageDelegate::TypeID GetTypeForTesting() const override;
 
   // Returns true if |options_mask| refers to an overridable SSL error.
   static bool IsOptionsOverridable(int options_mask);
 
  protected:
   // InterstitialPageDelegate implementation.
   void CommandReceived(const std::string& command) override;
   void OverrideEntry(content::NavigationEntry* entry) override;
   void OverrideRendererPrefs(content::RendererPreferences* prefs) override;
   void OnProceed() override;
@@ skipping 38 matching lines @@
   // Which type of interstitial this is.
   enum SSLInterstitialReason {
     SSL_REASON_SSL,
     SSL_REASON_BAD_CLOCK
   } interstitial_reason_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
 };
 
 #endif  // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_