Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/translate/translate_infobar_delegate.cc

Index: chrome/browser/translate/translate_infobar_delegate.cc
===================================================================
--- chrome/browser/translate/translate_infobar_delegate.cc	(revision 195254)
+++ chrome/browser/translate/translate_infobar_delegate.cc	(working copy)
@@ -50,9 +50,8 @@
 
   // 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;
   }
@@ -73,12 +72,12 @@
 }
 
 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());
 
@@ -86,17 +85,17 @@
 }
 
 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());
   }
@@ -107,7 +106,7 @@
   // 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);
@@ -225,8 +224,9 @@
     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() {
@@ -235,13 +235,13 @@
 
 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);
 }
 
@@ -364,6 +364,6 @@
 
 std::string TranslateInfoBarDelegate::GetPageHost() {
   NavigationEntry* entry =
-      owner()->GetWebContents()->GetController().GetActiveEntry();
+      owner()->web_contents()->GetController().GetActiveEntry();
   return entry ? entry->GetURL().HostNoBrackets() : std::string();
 }