TranslateManager is no longer a singleton

chrome/browser/translate/translate_ui_delegate.cc

 // Copyright 2013 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_ui_delegate.h"
 
 #include "base/i18n/string_compare.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 139 matching lines @@
 
 std::string TranslateUIDelegate::GetTargetLanguageCode() const {
   return GetLanguageCodeAt(GetTargetLanguageIndex());
 }
 
 void TranslateUIDelegate::Translate() {
   if (!web_contents()->GetBrowserContext()->IsOffTheRecord()) {
     prefs_->ResetTranslationDeniedCount(GetOriginalLanguageCode());
     prefs_->IncrementTranslationAcceptedCount(GetOriginalLanguageCode());
   }
-  TranslateManager::GetInstance()->TranslatePage(web_contents(),
-                                                 GetOriginalLanguageCode(),
-                                                 GetTargetLanguageCode());
+  TranslateManager* manager =
+      TranslateTabHelper::GetManagerFromWebContents(web_contents());

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

DCHECK(manager) here and below

+  manager->TranslatePage(GetOriginalLanguageCode(), GetTargetLanguageCode());
 
   UMA_HISTOGRAM_BOOLEAN(kPerformTranslate, true);
 }
 
 void TranslateUIDelegate::RevertTranslation() {
-  TranslateManager::GetInstance()->RevertTranslation(web_contents());
+  TranslateManager* manager =
+      TranslateTabHelper::GetManagerFromWebContents(web_contents());
+  manager->RevertTranslation();
 
   UMA_HISTOGRAM_BOOLEAN(kRevertTranslation, true);
 }
 
 void TranslateUIDelegate::TranslationDeclined(bool explicitly_closed) {
   if (!web_contents()->GetBrowserContext()->IsOffTheRecord()) {
     prefs_->ResetTranslationAcceptedCount(GetOriginalLanguageCode());
     prefs_->IncrementTranslationDeniedCount(GetOriginalLanguageCode());
   }
 
@@ skipping 66 matching lines @@
     prefs_->RemoveLanguagePairFromWhitelist(original_lang, target_lang);
 
   UMA_HISTOGRAM_BOOLEAN(kAlwaysTranslateLang, true);
 }
 
 std::string TranslateUIDelegate::GetPageHost() {
   content::NavigationEntry* entry =
       web_contents()->GetController().GetActiveEntry();
   return entry ? entry->GetURL().HostNoBrackets() : std::string();
 }