Move infobar handling to a tab helper.

chrome/browser/translate/translate_manager.cc

Index: chrome/browser/translate/translate_manager.cc
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index 94a499c83e6616207262abbceb6c91b079c1b642..96b6fcc8882ca14bc7b94b0874de847fd1516bf2 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -14,6 +14,7 @@
 #include "base/values.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/language_state.h"
@@ -512,9 +513,10 @@ void TranslateManager::InitiateTranslation(TabContents* tab,
   }
 
   // Prompts the user if he/she wants the page translated.
-  wrapper->AddInfoBar(TranslateInfoBarDelegate::CreateDelegate(
-      TranslateInfoBarDelegate::BEFORE_TRANSLATE, tab, language_code,
-      target_lang));
+  wrapper->infobar_tab_helper()->AddInfoBar(
+      TranslateInfoBarDelegate::CreateDelegate(
+        TranslateInfoBarDelegate::BEFORE_TRANSLATE, tab, language_code,
+        target_lang));
 }
 
 void TranslateManager::InitiateTranslationPosted(
@@ -763,9 +765,9 @@ void TranslateManager::ShowInfoBar(TabContents* tab,
     return;
   if (old_infobar) {
     // There already is a translate infobar, simply replace it.
-    wrapper->ReplaceInfoBar(old_infobar, infobar);
+    wrapper->infobar_tab_helper()->ReplaceInfoBar(old_infobar, infobar);
   } else {
-    wrapper->AddInfoBar(infobar);
+    wrapper->infobar_tab_helper()->AddInfoBar(infobar);
   }
 }
 
@@ -802,9 +804,10 @@ TranslateInfoBarDelegate* TranslateManager::GetTranslateInfoBarDelegate(
   if (!wrapper)
     return NULL;
 
-  for (size_t i = 0; i < wrapper->infobar_count(); ++i) {
+  for (size_t i = 0; i < wrapper->infobar_tab_helper()->infobar_count(); ++i) {

[Peter Kasting, 2011/08/31 18:47:32]

Nit: Factor this infobar_tab_helper() out to a temp

     TranslateInfoBarDelegate* delegate =
-        wrapper->GetInfoBarDelegateAt(i)->AsTranslateInfoBarDelegate();
+        wrapper->infobar_tab_helper()->GetInfoBarDelegateAt(i)->
+            AsTranslateInfoBarDelegate();
     if (delegate)
       return delegate;
   }