Use InterstitialPage through a delegate interface instead of deriving from it.

chrome/browser/safe_browsing/safe_browsing_blocking_page.h

 // Copyright (c) 2011 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.
 //
 // Classes for managing the SafeBrowsing interstitial pages.
 //
 // When a user is about to visit a page the SafeBrowsing system has deemed to
 // be malicious, either as malware or a phishing page, we show an interstitial
 // page with some options (go back, continue) to give the user a chance to avoid
 // the harmful page.
@@ skipping 15 matching lines @@
 // resources in a new interstitial.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
 #pragma once
 
 #include <map>
 #include <vector>
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/browser/tab_contents/chrome_interstitial_page.h"
+#include "content/public/browser/interstitial_page_delegate.h"
 #include "googleurl/src/gurl.h"
 
+class InterstitialPage;
+class MalwareDetails;
 class MessageLoop;
 class SafeBrowsingBlockingPageFactory;
-class MalwareDetails;
-class TabContents;
 
 namespace base {
 class DictionaryValue;
 }
 
-class SafeBrowsingBlockingPage : public ChromeInterstitialPage {
+namespace content {
+class WebContents;
+}
+
+class SafeBrowsingBlockingPage : public content::InterstitialPageDelegate {
  public:
   typedef std::vector<SafeBrowsingService::UnsafeResource> UnsafeResourceList;
   typedef std::map<content::WebContents*, UnsafeResourceList> UnsafeResourceMap;
 
   virtual ~SafeBrowsingBlockingPage();
 
   // Shows a blocking page warning the user about phishing/malware for a
   // specific resource.
   // You can call this method several times, if an interstitial is already
   // showing, the new one will be queued and displayed if the user decides
   // to proceed on the currently showing interstitial.
   static void ShowBlockingPage(
       SafeBrowsingService* service,
       const SafeBrowsingService::UnsafeResource& resource);
 
   // Makes the passed |factory| the factory used to instanciate
   // SafeBrowsingBlockingPage objects. Usefull for tests.
   static void RegisterFactory(SafeBrowsingBlockingPageFactory* factory) {
     factory_ = factory;
   }
 
-  // ChromeInterstitialPage method:
+  // InterstitialPageDelegate method:
   virtual std::string GetHTMLContents() OVERRIDE;
-  virtual void Proceed() OVERRIDE;
-  virtual void DontProceed() OVERRIDE;
+  virtual void CommandReceived(const std::string& command) OVERRIDE;
+  virtual void OverrideRendererPrefs(
+      content::RendererPreferences* prefs) OVERRIDE;
+  virtual void OnProceed() OVERRIDE;
+  virtual void OnDontProceed() OVERRIDE;
 
  protected:
   friend class SafeBrowsingBlockingPageTest;
-
-  // ChromeInterstitialPage method:
-  virtual void CommandReceived(const std::string& command) OVERRIDE;
+  friend class TestSafeBrowsingBlockingPage;
+  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest,
+                           ProceedThenDontProceed);
 
   void SetReportingPreference(bool report);
 
   // Don't instanciate this class directly, use ShowBlockingPage instead.
   SafeBrowsingBlockingPage(SafeBrowsingService* service,
                            content::WebContents* web_contents,
                            const UnsafeResourceList& unsafe_resources);
 
   // After a malware interstitial where the user opted-in to the
   // report but clicked "proceed anyway", we delay the call to
@@ skipping 72 matching lines @@
   int navigation_entry_index_to_remove_;
 
   // The list of unsafe resources this page is warning about.
   UnsafeResourceList unsafe_resources_;
 
   // A MalwareDetails object that we start generating when the
   // blocking page is shown. The object will be sent when the warning
   // is gone (if the user enables the feature).
   scoped_refptr<MalwareDetails> malware_details_;
 
+  bool proceeded_;
+
+  content::WebContents* web_contents_;
+  GURL url_;
+  InterstitialPage* interstitial_page_;  // Owns us
+
   // The factory used to instanciate SafeBrowsingBlockingPage objects.
   // Usefull for tests, so they can provide their own implementation of
   // SafeBrowsingBlockingPage.
   static SafeBrowsingBlockingPageFactory* factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingBlockingPage);
 };
 
 // Factory for creating SafeBrowsingBlockingPage.  Useful for tests.
 class SafeBrowsingBlockingPageFactory {
  public:
   virtual ~SafeBrowsingBlockingPageFactory() { }
 
   virtual SafeBrowsingBlockingPage* CreateSafeBrowsingPage(
       SafeBrowsingService* service,
       content::WebContents* web_contents,
       const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources) = 0;
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_