Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/ui/auto_login_infobar_delegate.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/ui/auto_login_infobar_delegate.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 185 matching lines @@
 }
 
 string16 AutoLoginInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_AUTOLOGIN_INFOBAR_OK_BUTTON : IDS_AUTOLOGIN_INFOBAR_CANCEL_BUTTON);
 }
 
 bool AutoLoginInfoBarDelegate::Accept() {
   // AutoLoginRedirector deletes itself.
-  new AutoLoginRedirector(&owner()->GetWebContents()->GetController(),
+  new AutoLoginRedirector(&owner()->web_contents()->GetController(),
                           params_.header.args);
   RecordHistogramAction(HISTOGRAM_ACCEPTED);
   button_pressed_ = true;
   return true;
 }
 
 bool AutoLoginInfoBarDelegate::Cancel() {
   Profile* profile = Profile::FromBrowserContext(
-      owner()->GetWebContents()->GetBrowserContext());
+      owner()->web_contents()->GetBrowserContext());
   PrefService* pref_service = profile->GetPrefs();
   pref_service->SetBoolean(prefs::kAutologinEnabled, false);
   RecordHistogramAction(HISTOGRAM_REJECTED);
   button_pressed_ = true;
   return true;
 }
 
 string16 AutoLoginInfoBarDelegate::GetMessageText(
     const std::string& username) const {
   return l10n_util::GetStringFUTF16(IDS_AUTOLOGIN_INFOBAR_MESSAGE,
                                     UTF8ToUTF16(username));
 }
 
 AutoLoginInfoBarDelegate::AutoLoginInfoBarDelegate(
     InfoBarService* owner,
     const Params& params)
     : ConfirmInfoBarDelegate(owner),
       params_(params),
       button_pressed_(false) {
   RecordHistogramAction(HISTOGRAM_SHOWN);
   registrar_.Add(this,
                  chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
                  content::Source<Profile>(Profile::FromBrowserContext(
-                     owner->GetWebContents()->GetBrowserContext())));
+                     owner->web_contents()->GetBrowserContext())));
 }
 
 AutoLoginInfoBarDelegate::~AutoLoginInfoBarDelegate() {
   if (!button_pressed_)
     RecordHistogramAction(HISTOGRAM_IGNORED);
 }
 
 void AutoLoginInfoBarDelegate::RecordHistogramAction(int action) {
   UMA_HISTOGRAM_ENUMERATION("AutoLogin.Regular", action, HISTOGRAM_MAX);
 }
 
 void AutoLoginInfoBarDelegate::Observe(int type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_GOOGLE_SIGNED_OUT, type);
   // owner() can be NULL when InfoBarService removes us. See
   // |InfoBarDelegate::clear_owner|.
   if (owner())
     owner()->RemoveInfoBar(this);
 }