TranslateManager is no longer a singleton

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/i18n/string_compare.h"
 #include "base/metrics/histogram.h"
@@ skipping 113 matching lines @@
 void TranslateInfoBarDelegate::Translate() {
   ui_delegate_.Translate();
 }
 
 void TranslateInfoBarDelegate::RevertTranslation() {
   ui_delegate_.RevertTranslation();
   infobar()->RemoveSelf();
 }
 
 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() {
   ui_delegate_.TranslationDeclined(false);
 }
 
 bool TranslateInfoBarDelegate::IsTranslatableLanguageByPrefs() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   Profile* original_profile = profile->GetOriginalProfile();
@@ skipping 97 matching lines @@
   return base::string16();
 }
 
 void TranslateInfoBarDelegate::MessageInfoBarButtonPressed() {
   DCHECK_EQ(TranslateTabHelper::TRANSLATE_ERROR, step_);
   if (error_type_ == TranslateErrors::UNSUPPORTED_LANGUAGE) {
     RevertTranslation();
     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() {
   return !GetMessageInfoBarButtonText().empty();
 }
 
 bool TranslateInfoBarDelegate::ShouldShowNeverTranslateShortcut() {
   DCHECK_EQ(TranslateTabHelper::BEFORE_TRANSLATE, step_);
   return !web_contents()->GetBrowserContext()->IsOffTheRecord() &&
       (prefs_->GetTranslationDeniedCount(original_language_code()) >=
@@ skipping 97 matching lines @@
   if (!details.is_navigation_to_different_page() && !details.is_main_frame)
     return false;
 
   return InfoBarDelegate::ShouldExpireInternal(details);
 }
 
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }