Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Unified Diff: chrome/browser/api/prefs/pref_member_unittest.cc

Issue 11345008: Remove content::NotificationObserver dependency from most Prefs code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for commit Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/api/prefs/pref_member.cc ('k') | chrome/browser/autofill/autofill_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/api/prefs/pref_member_unittest.cc
diff --git a/chrome/browser/api/prefs/pref_member_unittest.cc b/chrome/browser/api/prefs/pref_member_unittest.cc
index 67a515976c83f20149e1f71af86d54396e27a8a6..3539322d731ab35bc021eee31d6d43d95e7748ec 100644
--- a/chrome/browser/api/prefs/pref_member_unittest.cc
+++ b/chrome/browser/api/prefs/pref_member_unittest.cc
@@ -77,21 +77,17 @@ class GetPrefValueCallback
bool value_;
};
-class PrefMemberTestClass : public content::NotificationObserver {
+class PrefMemberTestClass : public PrefObserver {
public:
explicit PrefMemberTestClass(PrefService* prefs)
: observe_cnt_(0), prefs_(prefs) {
str_.Init(kStringPref, prefs, this);
}
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
- DCHECK(chrome::NOTIFICATION_PREF_CHANGED == type);
- PrefService* prefs_in = content::Source<PrefService>(source).ptr();
- EXPECT_EQ(prefs_in, prefs_);
- std::string* pref_name_in = content::Details<std::string>(details).ptr();
- EXPECT_EQ(*pref_name_in, kStringPref);
+ virtual void OnPreferenceChanged(PrefServiceBase* service,
+ const std::string& pref_name) OVERRIDE {
+ EXPECT_EQ(service, prefs_);
+ EXPECT_EQ(pref_name, kStringPref);
EXPECT_EQ(str_.GetValue(), prefs_->GetString(kStringPref));
++observe_cnt_;
}
« no previous file with comments | « chrome/browser/api/prefs/pref_member.cc ('k') | chrome/browser/autofill/autofill_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698