TranslateManager is no longer a singleton

chrome/browser/translate/translate_infobar_delegate.cc

Index: chrome/browser/translate/translate_infobar_delegate.cc
diff --git a/chrome/browser/translate/translate_infobar_delegate.cc b/chrome/browser/translate/translate_infobar_delegate.cc
index a2b8254571155f4e1148f26040180b65239e1b78..fa89f9c3b80778b62f7bc419af335eef6818fd77 100644
--- a/chrome/browser/translate/translate_infobar_delegate.cc
+++ b/chrome/browser/translate/translate_infobar_delegate.cc
@@ -131,8 +131,8 @@ void TranslateInfoBarDelegate::RevertTranslation() {
 }
 
 void TranslateInfoBarDelegate::ReportLanguageDetectionError() {
-  TranslateManager::GetInstance()->ReportLanguageDetectionError(
-      web_contents());
+  TranslateTabHelper::GetManagerFromWebContents(web_contents())

[blundell, 2014/02/18 09:21:46]

You should either DCHECK the manager here or short-circuit out if it's NULL - I
don't know which makes sense offhand.

[droger, 2014/02/18 10:16:51]

I'm doing a short-circuit here (because ReportLanguageDetectionError() has some
internal checks that seem to imply that it can be called when the tab is
destroyed). 

+      ->ReportLanguageDetectionError();
 }
 
 void TranslateInfoBarDelegate::TranslationDeclined() {
@@ -250,8 +250,8 @@ void TranslateInfoBarDelegate::MessageInfoBarButtonPressed() {
     return;
   }
   // This is the "Try again..." case.
-  TranslateManager::GetInstance()->TranslatePage(
-      web_contents(), original_language_code(), target_language_code());
+  TranslateTabHelper::GetManagerFromWebContents(web_contents())

[blundell, 2014/02/18 09:21:46]

Same question as above.

[droger, 2014/02/18 10:16:51]

I'm DCHECKing here, because TranslatePage() assumes that the WebContents are not
NULL. This should imply that the TranslateManager should always exist here.

+      ->TranslatePage(original_language_code(), target_language_code());
 }
 
 bool TranslateInfoBarDelegate::ShouldShowMessageInfoBarButton() {