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

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 107 matching lines @@
 #include "chrome/common/extensions/url_pattern_set.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/favicon_status.h"
+#include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/common_param_traits.h"
 #include "net/base/cookie_store.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
@@ skipping 50 matching lines @@
   } else if ((flags & ui::EF_MIDDLE_MOUSE_BUTTON) ==
              ui::EF_MIDDLE_MOUSE_BUTTON) {
     button = ui_controls::MIDDLE;
   } else {
     NOTREACHED();
   }
 
   ui_controls::SendMouseClick(button);
 }
 
-class AutomationInterstitialPage : public InterstitialPage {
+class AutomationInterstitialPage : public content::InterstitialPageDelegate {
  public:
   AutomationInterstitialPage(WebContents* tab,
                              const GURL& url,
                              const std::string& contents)
-      : InterstitialPage(tab, true, url),
-        contents_(contents) {
+      : contents_(contents) {
+    interstitial_page_ = InterstitialPage::Create(tab, true, url , this);

[Avi (use Gerrit), 2012/02/06 19:27:05]

space after |url|

+    interstitial_page_->Show();
   }
 
-  virtual std::string GetHTMLContents() { return contents_; }
+  virtual std::string GetHTMLContents() OVERRIDE { return contents_; }
 
  private:
   const std::string contents_;
+  InterstitialPage* interstitial_page_;  // Owns us.
 
   DISALLOW_COPY_AND_ASSIGN(AutomationInterstitialPage);
 };
 
 }  // namespace
 
 TestingAutomationProvider::TestingAutomationProvider(Profile* profile)
     : AutomationProvider(profile),
 #if defined(TOOLKIT_VIEWS)
       popup_menu_waiter_(NULL),
@@ skipping 1358 matching lines @@
     int tab_handle,
     const std::string& html_text,
     IPC::Message* reply_message) {
   if (tab_tracker_->ContainsHandle(tab_handle)) {
     NavigationController* controller = tab_tracker_->GetResource(tab_handle);
     WebContents* web_contents = controller->GetWebContents();
 
     new NavigationNotificationObserver(controller, this, reply_message, 1,
                                        false, false);
 
-    AutomationInterstitialPage* interstitial =
-        new AutomationInterstitialPage(web_contents,
-                                       GURL("about:interstitial"),
-                                       html_text);
-    interstitial->Show();
+    new AutomationInterstitialPage(
+        web_contents, GURL("about:interstitial"), html_text);
     return;
   }
 
   AutomationMsg_ShowInterstitialPage::WriteReplyParams(
       reply_message, AUTOMATION_MSG_NAVIGATION_ERROR);
   Send(reply_message);
 }
 
 void TestingAutomationProvider::HideInterstitialPage(int tab_handle,
                                                      bool* success) {
@@ skipping 5336 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }