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

chrome/browser/ui/pdf/pdf_unsupported_feature.cc

 // 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.
 
 #include "chrome/browser/ui/pdf/pdf_unsupported_feature.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/tab_contents/chrome_interstitial_page.h"
+#include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/tab_contents/interstitial_page.h"
+#include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
@@ skipping 121 matching lines @@
     if (old_delegate) {
       tab->infobar_tab_helper()->ReplaceInfoBar(old_delegate, new_delegate);
     } else {
       tab->infobar_tab_helper()->AddInfoBar(new_delegate);
     }
   }
 }
 
 // An interstitial to be used when the user chooses to open a PDF using Adobe
 // Reader, but it is out of date.
-class PDFUnsupportedFeatureInterstitial : public ChromeInterstitialPage {
+class PDFUnsupportedFeatureInterstitial
+    : public content::InterstitialPageDelegate {
  public:
   PDFUnsupportedFeatureInterstitial(
       TabContentsWrapper* tab,
       const WebPluginInfo& reader_webplugininfo)
-      : ChromeInterstitialPage(
-            tab->web_contents(), false, tab->web_contents()->GetURL()),
-        tab_contents_(tab),
+      : tab_contents_(tab),
         reader_webplugininfo_(reader_webplugininfo) {
     content::RecordAction(UserMetricsAction("PDF_ReaderInterstitialShown"));
+    interstitial_page_ = InterstitialPage::Create(
+        tab->web_contents(), false, tab->web_contents()->GetURL(), this);
+    interstitial_page_->Show();
   }
 
  protected:
-  // ChromeInterstitialPage implementation.
-  virtual std::string GetHTMLContents() {
+  // InterstitialPageDelegate implementation.
+  virtual std::string GetHTMLContents() OVERRIDE {
     DictionaryValue strings;
     strings.SetString(
         "title",
         l10n_util::GetStringUTF16(IDS_READER_OUT_OF_DATE_BLOCKING_PAGE_TITLE));
     strings.SetString(
         "headLine",
         l10n_util::GetStringUTF16(IDS_READER_OUT_OF_DATE_BLOCKING_PAGE_BODY));
     strings.SetString(
         "update",
         l10n_util::GetStringUTF16(IDS_READER_OUT_OF_DATE_BLOCKING_PAGE_UPDATE));
     strings.SetString(
         "open_with_reader",
         l10n_util::GetStringUTF16(
             IDS_READER_OUT_OF_DATE_BLOCKING_PAGE_PROCEED));
     strings.SetString(
         "ok",
         l10n_util::GetStringUTF16(IDS_READER_OUT_OF_DATE_BLOCKING_PAGE_OK));
     strings.SetString(
         "cancel",
         l10n_util::GetStringUTF16(IDS_READER_OUT_OF_DATE_BLOCKING_PAGE_CANCEL));
 
     base::StringPiece html(ResourceBundle::GetSharedInstance().
         GetRawDataResource(IDR_READER_OUT_OF_DATE_HTML));
 
     return jstemplate_builder::GetI18nTemplateHtml(html, &strings);
   }
 
-  virtual void CommandReceived(const std::string& command) {
+  virtual void CommandReceived(const std::string& command) OVERRIDE {
     if (command == "0") {
       content::RecordAction(
           UserMetricsAction("PDF_ReaderInterstitialCancel"));
-      DontProceed();
+      interstitial_page_->DontProceed();
       return;
     }
 
     if (command == "1") {
       content::RecordAction(
           UserMetricsAction("PDF_ReaderInterstitialUpdate"));
-      OpenReaderUpdateURL(tab());
+      OpenReaderUpdateURL(tab_contents_->web_contents());
     } else if (command == "2") {
       content::RecordAction(
           UserMetricsAction("PDF_ReaderInterstitialIgnore"));
       OpenUsingReader(tab_contents_, reader_webplugininfo_, NULL, NULL);
     } else {
       NOTREACHED();
     }
-    Proceed();
+    interstitial_page_->Proceed();
+  }
+
+  virtual void OverrideRendererPrefs(
+      content::RendererPreferences* prefs) OVERRIDE {
+    renderer_preferences_util::UpdateFromSystemSettings(
+        prefs, tab_contents_->profile());
   }
 
  private:
   TabContentsWrapper* tab_contents_;
   WebPluginInfo reader_webplugininfo_;
+  InterstitialPage* interstitial_page_;  // Owns us.
 
   DISALLOW_COPY_AND_ASSIGN(PDFUnsupportedFeatureInterstitial);
 };
 
 // The info bar delegate used to inform the user that we don't support a feature
 // in the PDF.  See the comment about how we swap buttons for
 // PDFEnableAdobeReaderInfoBarDelegate.
 class PDFUnsupportedFeatureInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // |reader_group| is NULL if Adobe Reader isn't installed.
@@ skipping 92 matching lines @@
 bool PDFUnsupportedFeatureInfoBarDelegate::OnYes() {
   if (!reader_installed_) {
     content::RecordAction(UserMetricsAction("PDF_InstallReaderInfoBarOK"));
     OpenReaderUpdateURL(tab_contents_->web_contents());
     return true;
   }
 
   content::RecordAction(UserMetricsAction("PDF_UseReaderInfoBarOK"));
 
   if (reader_vulnerable_) {
-    PDFUnsupportedFeatureInterstitial* interstitial =
-        new PDFUnsupportedFeatureInterstitial(tab_contents_,
-                                              reader_webplugininfo_);
-    interstitial->Show();
+    new PDFUnsupportedFeatureInterstitial(tab_contents_, reader_webplugininfo_);
     return true;
   }
 
   if (tab_contents_->profile()->GetPrefs()->GetBoolean(
       prefs::kPluginsShowSetReaderDefaultInfobar)) {
     InfoBarDelegate* bar = new PDFEnableAdobeReaderInfoBarDelegate(
         tab_contents_->infobar_tab_helper(), tab_contents_->profile());
     OpenUsingReader(tab_contents_, reader_webplugininfo_, this, bar);
     return false;
   }
@@ skipping 49 matching lines @@
   // Only works for Windows for now.  For Mac, we'll have to launch the file
   // externally since Adobe Reader doesn't work inside Chrome.
   return;
 #endif
 
   PluginService::GetInstance()->GetPluginGroups(
       base::Bind(&GotPluginGroupsCallback,
           tab->web_contents()->GetRenderProcessHost()->GetID(),
           tab->web_contents()->GetRenderViewHost()->routing_id()));
 }