Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/plugins/plugin_infobar_delegates.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/plugins/plugin_infobar_delegates.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 39 matching lines @@
 
 PluginInfoBarDelegate::~PluginInfoBarDelegate() {
 }
 
 bool PluginInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   OpenURLParams params(
       GURL(GetLearnMoreURL()), Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK,
       false);
-  owner()->GetWebContents()->OpenURL(params);
+  owner()->web_contents()->OpenURL(params);
   return false;
 }
 
 void PluginInfoBarDelegate::LoadBlockedPlugins() {
-  content::WebContents* web_contents = owner()->GetWebContents();
+  content::WebContents* web_contents = owner()->web_contents();
   if (web_contents) {
     content::RenderViewHost* host = web_contents->GetRenderViewHost();
     ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
         host->GetProcess()->GetID());
     host->Send(new ChromeViewMsg_LoadBlockedPlugins(
         host->GetRoutingID(), identifier_));
   }
 }
 
 gfx::Image* PluginInfoBarDelegate::GetIcon() const {
@@ skipping 66 matching lines @@
 bool UnauthorizedPluginInfoBarDelegate::Accept() {
   content::RecordAction(
       UserMetricsAction("BlockedPluginInfobar.AllowThisTime"));
   LoadBlockedPlugins();
   return true;
 }
 
 bool UnauthorizedPluginInfoBarDelegate::Cancel() {
   content::RecordAction(
       UserMetricsAction("BlockedPluginInfobar.AlwaysAllow"));
-  content_settings_->AddExceptionForURL(owner()->GetWebContents()->GetURL(),
-                                        owner()->GetWebContents()->GetURL(),
+  content_settings_->AddExceptionForURL(owner()->web_contents()->GetURL(),
+                                        owner()->web_contents()->GetURL(),
                                         CONTENT_SETTINGS_TYPE_PLUGINS,
                                         std::string(),
                                         CONTENT_SETTING_ALLOW);
   LoadBlockedPlugins();
   return true;
 }
 
 void UnauthorizedPluginInfoBarDelegate::InfoBarDismissed() {
   content::RecordAction(
       UserMetricsAction("BlockedPluginInfobar.Dismissed"));
@@ skipping 81 matching lines @@
       IDS_PLUGIN_UPDATE : IDS_PLUGIN_ENABLE_TEMPORARILY);
 }
 
 bool OutdatedPluginInfoBarDelegate::Accept() {
   content::RecordAction(UserMetricsAction("OutdatedPluginInfobar.Update"));
   if (installer()->state() != PluginInstaller::INSTALLER_STATE_IDLE) {
     NOTREACHED();
     return false;
   }
 
-  content::WebContents* web_contents = owner()->GetWebContents();
+  content::WebContents* web_contents = owner()->web_contents();
   // A call to any of |OpenDownloadURL()| or |StartInstalling()| will
   // result in deleting ourselves. Accordingly, we make sure to
   // not pass a reference to an object that can go away.
   // http://crbug.com/54167
   GURL plugin_url(plugin_metadata_->plugin_url());
   if (plugin_metadata_->url_for_display()) {
     installer()->OpenDownloadURL(plugin_url, web_contents);
   } else {
     installer()->StartInstalling(plugin_url, web_contents);
   }
@@ skipping 156 matching lines @@
   GURL url(plugin_metadata_->help_url());
   if (url.is_empty()) {
     url = google_util::AppendGoogleLocaleParam(GURL(
       "https://www.google.com/support/chrome/bin/answer.py?answer=142064"));
   }
 
   OpenURLParams params(
       url, Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
-  owner()->GetWebContents()->OpenURL(params);
+  owner()->web_contents()->OpenURL(params);
   return false;
 }
 
 void PluginInstallerInfoBarDelegate::DownloadStarted() {
   ReplaceWithInfoBar(l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOADING,
                                                 plugin_metadata_->name()));
 }
 
 void PluginInstallerInfoBarDelegate::DownloadCancelled() {
   ReplaceWithInfoBar(l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOAD_CANCELLED,
@@ skipping 74 matching lines @@
       IDS_WIN8_DESKTOP_RESTART : IDS_WIN8_RESTART);
 }
 
 bool PluginMetroModeInfoBarDelegate::Accept() {
   chrome::AttemptRestartWithModeSwitch();
   return true;
 }
 
 bool PluginMetroModeInfoBarDelegate::Cancel() {
   DCHECK_EQ(DESKTOP_MODE_REQUIRED, mode_);
-  content::WebContents* web_contents = owner()->GetWebContents();
+  content::WebContents* web_contents = owner()->web_contents();
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   HostContentSettingsMap* content_settings =
       profile->GetHostContentSettingsMap();
   GURL url = web_contents->GetURL();
   content_settings->SetContentSetting(
       ContentSettingsPattern::FromURL(url),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,
       std::string(),
       CONTENT_SETTING_BLOCK);
   return true;
 }
 
 string16 PluginMetroModeInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool PluginMetroModeInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   OpenURLParams params(
       GURL((mode_ == MISSING_PLUGIN) ?
           "https://support.google.com/chrome/?p=ib_display_in_desktop" :
           "https://support.google.com/chrome/?p=ib_redirect_to_desktop"),
       Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
-  owner()->GetWebContents()->OpenURL(params);
+  owner()->web_contents()->OpenURL(params);
   return false;
 }
 #endif  // defined(OS_WIN)
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)