Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/translate/translate_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/translate/translate_infobar_delegate.h"
 
 #include <algorithm>
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 32 matching lines @@
       // The original language can only be "unknown" for the "translating"
       // infobar, which is the case when the user started a translation from the
       // context menu.
       DCHECK_EQ(TRANSLATING, infobar_type);
       DCHECK_EQ(chrome::kUnknownLanguageCode, original_language);
     }
   }
 
   // Find any existing translate infobar delegate.
   TranslateInfoBarDelegate* old_delegate = NULL;
-  for (size_t i = 0; i < infobar_service->GetInfoBarCount(); ++i) {
-    old_delegate =
-        infobar_service->GetInfoBarDelegateAt(i)->AsTranslateInfoBarDelegate();
+  for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
+    old_delegate = infobar_service->infobar_at(i)->AsTranslateInfoBarDelegate();
     if (old_delegate)
       break;
   }
 
   // Create the new delegate.
   scoped_ptr<TranslateInfoBarDelegate> infobar(
       new TranslateInfoBarDelegate(infobar_type, error_type, infobar_service,
                                    prefs, original_language, target_language));
   infobar->UpdateBackgroundAnimation(old_delegate);
 
   // Add the new delegate if necessary.
   if (!old_delegate) {
     infobar_service->AddInfoBar(infobar.PassAs<InfoBarDelegate>());
   } else if (replace_existing_infobar) {
     infobar_service->ReplaceInfoBar(old_delegate,
                                     infobar.PassAs<InfoBarDelegate>());
   }
 }
 
 void TranslateInfoBarDelegate::Translate() {
-  if (!owner()->GetWebContents()->GetBrowserContext()->IsOffTheRecord()) {
+  if (!owner()->web_contents()->GetBrowserContext()->IsOffTheRecord()) {
     prefs_.ResetTranslationDeniedCount(original_language_code());
     prefs_.IncrementTranslationAcceptedCount(original_language_code());
   }
 
-  TranslateManager::GetInstance()->TranslatePage(owner()->GetWebContents(),
+  TranslateManager::GetInstance()->TranslatePage(owner()->web_contents(),
                                                  original_language_code(),
                                                  target_language_code());
 
   UMA_HISTOGRAM_COUNTS("Translate.Translate", 1);
 }
 
 void TranslateInfoBarDelegate::RevertTranslation() {
-  TranslateManager::GetInstance()->RevertTranslation(owner()->GetWebContents());
+  TranslateManager::GetInstance()->RevertTranslation(owner()->web_contents());
   RemoveSelf();
 }
 
 void TranslateInfoBarDelegate::ReportLanguageDetectionError() {
   TranslateManager::GetInstance()->
-      ReportLanguageDetectionError(owner()->GetWebContents());
+      ReportLanguageDetectionError(owner()->web_contents());
 }
 
 void TranslateInfoBarDelegate::TranslationDeclined() {
-  if (!owner()->GetWebContents()->GetBrowserContext()->IsOffTheRecord()) {
+  if (!owner()->web_contents()->GetBrowserContext()->IsOffTheRecord()) {
     prefs_.ResetTranslationAcceptedCount(original_language_code());
     prefs_.IncrementTranslationDeniedCount(original_language_code());
   }
 
   // Remember that the user declined the translation so as to prevent showing a
   // translate infobar for that page again.  (TranslateManager initiates
   // translations when getting a LANGUAGE_DETERMINED from the page, which
   // happens when a load stops. That could happen multiple times, including
   // after the user already declined the translation.)
   TranslateTabHelper* translate_tab_helper =
-      TranslateTabHelper::FromWebContents(owner()->GetWebContents());
+      TranslateTabHelper::FromWebContents(owner()->web_contents());
   translate_tab_helper->language_state().set_translation_declined(true);
 
   UMA_HISTOGRAM_COUNTS("Translate.DeclineTranslate", 1);
 }
 
 bool TranslateInfoBarDelegate::IsLanguageBlacklisted() {
   return prefs_.IsLanguageBlacklisted(original_language_code());
 }
 
 void TranslateInfoBarDelegate::ToggleLanguageBlacklist() {
@@ skipping 97 matching lines @@
   return string16();
 }
 
 void TranslateInfoBarDelegate::MessageInfoBarButtonPressed() {
   DCHECK_EQ(TRANSLATION_ERROR, infobar_type_);
   if (error_type_ == TranslateErrors::UNSUPPORTED_LANGUAGE) {
     RevertTranslation();
     return;
   }
   // This is the "Try again..." case.
-  TranslateManager::GetInstance()->TranslatePage(owner()->GetWebContents(),
-      original_language_code(), target_language_code());
+  TranslateManager::GetInstance()->TranslatePage(owner()->web_contents(),
+                                                 original_language_code(),
+                                                 target_language_code());
 }
 
 bool TranslateInfoBarDelegate::ShouldShowMessageInfoBarButton() {
   return !GetMessageInfoBarButtonText().empty();
 }
 
 bool TranslateInfoBarDelegate::ShouldShowNeverTranslateButton() {
   DCHECK_EQ(BEFORE_TRANSLATE, infobar_type_);
-  return !owner()->GetWebContents()->GetBrowserContext()->IsOffTheRecord() &&
+  return !owner()->web_contents()->GetBrowserContext()->IsOffTheRecord() &&
       (prefs_.GetTranslationDeniedCount(original_language_code()) >= 3);
 }
 
 bool TranslateInfoBarDelegate::ShouldShowAlwaysTranslateButton() {
   DCHECK_EQ(BEFORE_TRANSLATE, infobar_type_);
-  return !owner()->GetWebContents()->GetBrowserContext()->IsOffTheRecord() &&
+  return !owner()->web_contents()->GetBrowserContext()->IsOffTheRecord() &&
       (prefs_.GetTranslationAcceptedCount(original_language_code()) >= 3);
 }
 
 void TranslateInfoBarDelegate::UpdateBackgroundAnimation(
     TranslateInfoBarDelegate* previous_infobar) {
   if (!previous_infobar || previous_infobar->IsError() == IsError())
     background_animation_ = NONE;
   else
     background_animation_ = IsError() ? NORMAL_TO_ERROR : ERROR_TO_NORMAL;
 }
@@ skipping 102 matching lines @@
   return PAGE_ACTION_TYPE;
 }
 
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }
 
 std::string TranslateInfoBarDelegate::GetPageHost() {
   NavigationEntry* entry =
-      owner()->GetWebContents()->GetController().GetActiveEntry();
+      owner()->web_contents()->GetController().GetActiveEntry();
   return entry ? entry->GetURL().HostNoBrackets() : std::string();
 }