TranslateManager is no longer a singleton

chrome/browser/translate/translate_manager_browsertest.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 <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 212 matching lines @@
 
   MOCK_METHOD1(OnPreferenceChanged, void(const std::string&));
 
  protected:
   virtual void SetUp() {
     // This test is a unit test but runs in the browser_tests suite. Therefore
     // it needs to manage its own TestingBrowserProcess.
     // 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();
-    // 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
-    // matters as they both register for similar events and we want the
-    // notifications to happen in the same sequence (TranslateManager first,
-    // WebContents second).  Also clears the translate script so it is fetched
-    // everytime and sets the expiration delay to a large value by default (in
-    // case it was zeroed in a previous test).
+
     TranslateService::Initialize();
+    TranslateService::SetUseInfobar(true);
+
+    // Clears the translate script so it is fetched everytime and sets the
+    // expiration delay to a large value by default (in case it was zeroed in a
+    // previous test).
     TranslateDownloadManager* download_manager =
         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,
         content::Source<InfoBarService>(infobar_service()));
   }
 
   virtual void TearDown() {
     process()->sink().ClearMessages();
 
     notification_registrar_.Remove(this,
@@ skipping 530 matching lines @@
   ReloadAndWait(true);
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
   EXPECT_TRUE(CloseTranslateInfoBar());
 
   // ...But not show it if the reload fails.
   ReloadAndWait(false);
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 
   // 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);
 }
 
 // Test that reloading the page by way of typing again the URL in the
 // location bar brings back the infobar.
 TEST_F(TranslateManagerBrowserTest, ReloadFromLocationBar) {
   GURL url("http://www.google.fr");
   SimulateNavigation(url, "fr", true);
 
@@ skipping 811 matching lines @@
   content::WebContents* current_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   content::Source<content::WebContents> source(current_web_contents);
 
   ui_test_utils::WindowedNotificationObserverWithDetails<
     LanguageDetectionDetails>
       fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
                                   source);
   fr_language_detected_signal.Wait();
 }