Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/ui/sync/one_click_signin_helper.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/sync/one_click_signin_helper.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
@@ skipping 534 matching lines @@
 }
 
 string16 OneClickInfoBarDelegateImpl::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16(
       (button == BUTTON_OK) ? IDS_ONE_CLICK_SIGNIN_INFOBAR_OK_BUTTON
                             : IDS_ONE_CLICK_SIGNIN_INFOBAR_CANCEL_BUTTON);
 }
 
 bool OneClickInfoBarDelegateImpl::Accept() {
-  content::WebContents* web_contents = owner()->GetWebContents();
+  content::WebContents* web_contents = owner()->web_contents();
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   Profile* profile = Profile::FromBrowserContext(
       web_contents->GetBrowserContext());
 
   // User has accepted one-click sign-in for this account. Never ask again for
   // this profile.
   SigninManager::DisableOneClickSignIn(profile);
   RecordHistogramAction(one_click_signin::HISTOGRAM_ACCEPTED);
   chrome::FindBrowserWithWebContents(web_contents)->window()->
       ShowOneClickSigninBubble(
           BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE,
           UTF8ToUTF16(email_),
           base::Bind(&StartSync,
                      StartSyncArgs(profile, browser,
                                    OneClickSigninHelper::AUTO_ACCEPT_NONE,
                                    session_index_, email_, password_,
                                    false /* force_same_tab_navigation */)));
   button_pressed_ = true;
   return true;
 }
 
 bool OneClickInfoBarDelegateImpl::Cancel() {
   AddEmailToOneClickRejectedList(Profile::FromBrowserContext(
-      owner()->GetWebContents()->GetBrowserContext()), email_);
+      owner()->web_contents()->GetBrowserContext()), email_);
   RecordHistogramAction(one_click_signin::HISTOGRAM_REJECTED);
   button_pressed_ = true;
   return true;
 }
 
 string16 OneClickInfoBarDelegateImpl::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool OneClickInfoBarDelegateImpl::LinkClicked(
     WindowOpenDisposition disposition) {
   RecordHistogramAction(one_click_signin::HISTOGRAM_LEARN_MORE);
   content::OpenURLParams params(
       GURL(chrome::kChromeSyncLearnMoreURL), content::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 OneClickInfoBarDelegateImpl::GetAlternateColors(
     AlternateColors* alt_colors) {
   if (use_blue_on_white) {
     alt_colors->enabled = true;
     alt_colors->infobar_bottom_color = SK_ColorWHITE;
     alt_colors->infobar_top_color = SK_ColorWHITE;
     alt_colors->button_text_color = SK_ColorWHITE;
@@ skipping 833 matching lines @@
 
 void OneClickSigninHelper::SigninSuccess() {
   RedirectOnSigninComplete(true);
 }
 
 void OneClickSigninHelper::RedirectOnSigninComplete(bool show_bubble) {
   // Show the result in the sign-in bubble if desired.
   RedirectToNtpOrAppsPage(show_bubble);
   signin_tracker_.reset();
 }