TranslateManager is no longer a singleton

chrome/browser/translate/translate_manager_browsertest.cc

Index: chrome/browser/translate/translate_manager_browsertest.cc
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 676490b9ce794317113de481ddf4c977a08698c1..5c4d0e02dd37733719850bee8e31a34340ba0d36 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -230,6 +230,9 @@ class TranslateManagerBrowserTest : public ChromeRenderViewHostTestHarness,
     // TODO(jamescook): Figure out how to move this suite back to unit_tests.
     // Right now it fails to get the translate infobar if you run it there.
     TestingBrowserProcess::CreateInstance();
+
+    // TODO: update comment.

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

Address this :).

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

Ooops. Done.

+
     // Access the TranslateManager singleton so it is created before we call
     // ChromeRenderViewHostTestHarness::SetUp() to match what's done in Chrome,
     // where the TranslateManager is created before the WebContents.  This
@@ -243,12 +246,14 @@ class TranslateManagerBrowserTest : public ChromeRenderViewHostTestHarness,
         TranslateDownloadManager::GetInstance();
     download_manager->ClearTranslateScriptForTesting();
     download_manager->SetTranslateScriptExpirationDelay(60 * 60 * 1000);
-    TranslateManager::GetInstance()->set_translate_max_reload_attemps(0);
     TranslateService::SetUseInfobar(true);
 
     ChromeRenderViewHostTestHarness::SetUp();
     InfoBarService::CreateForWebContents(web_contents());
     TranslateTabHelper::CreateForWebContents(web_contents());
+    TranslateManager* manager =
+        TranslateTabHelper::GetManagerFromWebContents(web_contents());
+    manager->set_translate_max_reload_attemps(0);
 
     notification_registrar_.Add(this,
         chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
@@ -799,7 +804,9 @@ TEST_F(TranslateManagerBrowserTest, Reload) {
 
   // If we set reload attempts to a high value, we will not see the infobar
   // immediately.
-  TranslateManager::GetInstance()->set_translate_max_reload_attemps(100);
+  TranslateManager* manager =
+      TranslateTabHelper::GetManagerFromWebContents(web_contents());
+  manager->set_translate_max_reload_attemps(100);
   ReloadAndWait(true);
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 }