Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/google/google_url_tracker_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/google/google_url_tracker_infobar_delegate.h"
 
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/navigation_details.h"
@@ skipping 30 matching lines @@
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool GoogleURLTrackerInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   content::OpenURLParams params(google_util::AppendGoogleLocaleParam(GURL(
       "https://www.google.com/support/chrome/bin/answer.py?answer=1618699")),
       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;
 }
 
 bool GoogleURLTrackerInfoBarDelegate::ShouldExpireInternal(
     const content::LoadCommittedDetails& details) const {
   int unique_id = details.entry->GetUniqueID();
   return (unique_id != contents_unique_id()) && (unique_id != pending_id_);
 }
 
 void GoogleURLTrackerInfoBarDelegate::Update(const GURL& search_url) {
   StoreActiveEntryUniqueID();
   search_url_ = search_url;
   pending_id_ = 0;
 }
 
 void GoogleURLTrackerInfoBarDelegate::Close(bool redo_search) {
   if (redo_search) {
     // Re-do the user's search on the new domain.
     DCHECK(search_url_.is_valid());
     url_canon::Replacements<char> replacements;
     const std::string& host(google_url_tracker_->fetched_google_url().host());
     replacements.SetHost(host.data(), url_parse::Component(0, host.length()));
     GURL new_search_url(search_url_.ReplaceComponents(replacements));
     if (new_search_url.is_valid()) {
-      owner()->GetWebContents()->OpenURL(content::OpenURLParams(
+      owner()->web_contents()->OpenURL(content::OpenURLParams(
           new_search_url, content::Referrer(), CURRENT_TAB,
           content::PAGE_TRANSITION_GENERATED, false));
     }
   }
 
   owner()->RemoveInfoBar(this);
 }
 
 GoogleURLTrackerInfoBarDelegate::GoogleURLTrackerInfoBarDelegate(
     InfoBarService* infobar_service,
@@ skipping 19 matching lines @@
     InfoBarButton button) const {
   if (button == BUTTON_OK) {
     return l10n_util::GetStringFUTF16(
         IDS_GOOGLE_URL_TRACKER_INFOBAR_SWITCH,
         net::StripWWWFromHost(google_url_tracker_->fetched_google_url()));
   }
   return l10n_util::GetStringFUTF16(
       IDS_GOOGLE_URL_TRACKER_INFOBAR_DONT_SWITCH,
       net::StripWWWFromHost(google_url_tracker_->google_url()));
 }