Fix the TranslateManager and unit-tests....

chrome/browser/translate/translate_manager_unittest.cc

 // Copyright (c) 2010 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/renderer_host/test/test_render_view_host.h"
 
 #include "chrome/browser/renderer_host/mock_render_process_host.h"
 #include "chrome/browser/translate/translate_infobars_delegates.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/common/ipc_test_sink.h"
 #include "chrome/common/render_messages.h"
 
 class TestTranslateManager : public TranslateManager {
  public:
   TestTranslateManager() {}
-
- protected:
-  virtual bool TestEnabled() { return true; }
 };
 
 class TranslateManagerTest : public RenderViewHostTestHarness {
  public:
   // Simluates navigating to a page and getting teh page contents and language
   // for that navigation.
   void SimulateNavigation(const GURL& url, int page_id,
                           const std::wstring& contents,
                           const std::string& lang) {
     NavigateAndCommit(url);
     rvh()->TestOnMessageReceived(ViewHostMsg_PageContents(0, url, page_id,
                                                           contents, lang));
   }
 
   bool GetTranslateMessage(int* page_id,
                            std::string* original_lang,
                            std::string* target_lang) {
     const IPC::Message* message =
         process()->sink().GetFirstMessageMatching(ViewMsg_TranslatePage::ID);
     if (!message)
       return false;
     Tuple3<int, std::string, std::string> translate_param;
     ViewMsg_TranslatePage::Read(message, &translate_param);
     *page_id = translate_param.a;
     *original_lang = translate_param.b;
     *target_lang = translate_param.c;
     return true;
   }
 
+ protected:
+  virtual void SetUp() {
+    RenderViewHostTestHarness::SetUp();
+
+    TranslateManager::set_test_enabled(true);
+    // This must be created after set_test_enabled() has been called to register
+    // notifications properly.
+    translate_manager_.reset(new TestTranslateManager());
+  }
+
+  virtual void TearDown() {
+    RenderViewHostTestHarness::TearDown();
+
+    TranslateManager::set_test_enabled(false);
+  }
+
  private:
-  TestTranslateManager translate_manager_;
+  scoped_ptr<TestTranslateManager> translate_manager_;
 };
 
 TEST_F(TranslateManagerTest, NormalTranslate) {
   // Simulate navigating to a page.
   SimulateNavigation(GURL("http://www.google.fr"), 0, L"Le Google", "fr");
 
   // We should have an info-bar.
   ASSERT_EQ(1, contents()->infobar_delegate_count());
   TranslateInfoBarDelegate* infobar =
       contents()->GetInfoBarDelegateAt(0)->AsTranslateInfoBarDelegate();
@@ skipping 73 matching lines @@
   EXPECT_EQ("fr", original_lang);
   EXPECT_EQ("en", target_lang);
 
   // Now navigate to a page in a different language.
   process()->sink().ClearMessages();
   SimulateNavigation(GURL("http://news.google.es"), 1, L"Las news", "es");
 
   // This should not have triggered a translate.
   EXPECT_FALSE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
 }