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..3161152dbb44c00ea7d54e5f5d4771fff06684ec 100644
--- a/chrome/browser/translate/translate_infobar_delegate.cc
+++ b/chrome/browser/translate/translate_infobar_delegate.cc
@@ -131,8 +131,11 @@ void TranslateInfoBarDelegate::RevertTranslation() {
 }
 
 void TranslateInfoBarDelegate::ReportLanguageDetectionError() {
-  TranslateManager::GetInstance()->ReportLanguageDetectionError(
-      web_contents());
+  TranslateManager* manager =
+      TranslateTabHelper::GetManagerFromWebContents(web_contents());
+  if (!manager)

[MAD, 2014/02/18 20:29:12]

Why an if here and DCHECK elsewhere?

[droger, 2014/02/19 09:17:29]

The logic I used is the following:

- if the function assumes web_contents cannot be NULL (like TranslatePage()
which would crash in this case), then I assume that the page necessarily still
exists and I that I can always get the TranslateManager from it. I put a DCHECK
in that case.

- For ReportLanguageDetectionError, I did differently because the function
gracefully handles the case where
chrome::FindBrowserWithWebContents(web_contents) returns NULL. I think that
might mean that web_contents can be NULL here, and manager would be NULL in this
case. That's why I explicitly handle this case.

[MAD, 2014/02/19 16:22:07]

OK, good point... I wonder if we should add a comment explaining why manager
could be NULL here?

[droger, 2014/02/19 16:40:08]

I don't know if this actually happen.
I'll make a try job with some DCHECK here and see if it is hit.

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