Fix the TranslateManager and unit-tests.

There was a bug that was initialy turning on translate all the time.
When fixed it made the unit-tests fail, revealing another bug.
The test was calling a virtual method in its constructor, which was bad and not turning on translate for the tests.

BUG=None
TEST=UI tests, browser tests, unit-tests should pass.

Review URL: http://codereview.chromium.org/601069

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38995 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h
index e41fb04..706dd2c 100644
--- a/chrome/browser/translate/translate_manager.h
+++ b/chrome/browser/translate/translate_manager.h
@@ -30,10 +30,10 @@ class TranslateManager : public NotificationObserver {
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
- protected:
-  // Overriden by unit-tests to enable the TranslateManager.
-  virtual bool TestEnabled() { return false; }
+  // Used by unit-test to enable the TranslateManager for testing purpose.
+  static void set_test_enabled(bool enabled) { test_enabled_ = enabled; }
 
+ protected:
   TranslateManager();
 
  private:
@@ -58,6 +58,8 @@ class TranslateManager : public NotificationObserver {
   typedef std::map<PrefService*, LanguageSet> PrefServiceLanguagesMap;
   PrefServiceLanguagesMap accept_languages_;
 
+  static bool test_enabled_;
+
   DISALLOW_COPY_AND_ASSIGN(TranslateManager);
 };