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 30cd55b7cd8512a00019e61395dea28beb5c0b8d..e5d26d99d20c1eee837f5e97142780f983490e67 100644 |
--- a/chrome/browser/translate/translate_manager_browsertest.cc |
+++ b/chrome/browser/translate/translate_manager_browsertest.cc |
@@ -10,6 +10,7 @@ |
#include "base/json/json_writer.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/prefs/public/pref_change_registrar.h" |
+#include "base/prefs/public/pref_observer.h" |
#include "base/stringprintf.h" |
#include "base/utf_string_conversions.h" |
#include "base/values.h" |
@@ -92,7 +93,8 @@ class NavEntryCommittedObserver : public content::NotificationObserver { |
}; |
class TranslateManagerTest : public ChromeRenderViewHostTestHarness, |
- public content::NotificationObserver { |
+ public content::NotificationObserver, |
+ public PrefObserver { |
public: |
TranslateManagerTest() |
: ui_thread_(BrowserThread::UI, &message_loop_) { |
@@ -214,6 +216,8 @@ class TranslateManagerTest : public ChromeRenderViewHostTestHarness, |
content::Details<InfoBarRemovedDetails>(details)->first); |
} |
+ MOCK_METHOD2(OnPreferenceChanged, void(PrefServiceBase*, const std::string&)); |
+ |
protected: |
virtual void SetUp() { |
WebKit::initialize(webkit_platform_support_.Get()); |
@@ -291,15 +295,9 @@ class TranslateManagerTest : public ChromeRenderViewHostTestHarness, |
} |
void SetPrefObserverExpectation(const char* path) { |
- EXPECT_CALL( |
- pref_observer_, |
- Observe(int(chrome::NOTIFICATION_PREF_CHANGED), |
- _, |
- Property(&content::Details<std::string>::ptr, Pointee(path)))); |
+ EXPECT_CALL(*this, OnPreferenceChanged(_, std::string(path))); |
} |
- content::MockNotificationObserver pref_observer_; |
- |
private: |
content::NotificationRegistrar notification_registrar_; |
net::TestURLFetcherFactory url_fetcher_factory_; |
@@ -1094,8 +1092,7 @@ TEST_F(TranslateManagerTest, NeverTranslateLanguagePref) { |
PrefService* prefs = profile->GetPrefs(); |
PrefChangeRegistrar registrar; |
registrar.Init(prefs); |
- registrar.Add(TranslatePrefs::kPrefTranslateLanguageBlacklist, |
- &pref_observer_); |
+ registrar.Add(TranslatePrefs::kPrefTranslateLanguageBlacklist, this); |
TranslatePrefs translate_prefs(prefs); |
EXPECT_FALSE(translate_prefs.IsLanguageBlacklisted("fr")); |
EXPECT_TRUE(translate_prefs.CanTranslate(prefs, "fr", url)); |
@@ -1142,8 +1139,7 @@ TEST_F(TranslateManagerTest, NeverTranslateSitePref) { |
PrefService* prefs = profile->GetPrefs(); |
PrefChangeRegistrar registrar; |
registrar.Init(prefs); |
- registrar.Add(TranslatePrefs::kPrefTranslateSiteBlacklist, |
- &pref_observer_); |
+ registrar.Add(TranslatePrefs::kPrefTranslateSiteBlacklist, this); |
TranslatePrefs translate_prefs(prefs); |
EXPECT_FALSE(translate_prefs.IsSiteBlacklisted(host)); |
EXPECT_TRUE(translate_prefs.CanTranslate(prefs, "fr", url)); |
@@ -1182,8 +1178,7 @@ TEST_F(TranslateManagerTest, AlwaysTranslateLanguagePref) { |
PrefService* prefs = profile->GetPrefs(); |
PrefChangeRegistrar registrar; |
registrar.Init(prefs); |
- registrar.Add(TranslatePrefs::kPrefTranslateWhitelists, |
- &pref_observer_); |
+ registrar.Add(TranslatePrefs::kPrefTranslateWhitelists, this); |
TranslatePrefs translate_prefs(prefs); |
SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateWhitelists); |
translate_prefs.WhitelistLanguagePair("fr", "en"); |