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

Unified Diff: chrome/browser/prefs/pref_notifier_impl_unittest.cc

Issue 8568019: Introduce per-tab preferences service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
Index: chrome/browser/prefs/pref_notifier_impl_unittest.cc
diff --git a/chrome/browser/prefs/pref_notifier_impl_unittest.cc b/chrome/browser/prefs/pref_notifier_impl_unittest.cc
index bf991e2a71b3879951be23a2af7ba505a99b6e67..7397afdb64e60aa012e13b0630c23e28ef472e5f 100644
--- a/chrome/browser/prefs/pref_notifier_impl_unittest.cc
+++ b/chrome/browser/prefs/pref_notifier_impl_unittest.cc
@@ -29,8 +29,6 @@ const char kUnchangedPref[] = "unchanged_pref";
// Test PrefNotifier that allows tracking of observers and notifications.
class MockPrefNotifier : public PrefNotifierImpl {
public:
- explicit MockPrefNotifier(PrefService* pref_service)
- : PrefNotifierImpl(pref_service) {}
virtual ~MockPrefNotifier() {}
MOCK_METHOD1(FireObservers, void(const std::string& path));
@@ -73,13 +71,15 @@ class PrefNotifierTest : public testing::Test {
};
TEST_F(PrefNotifierTest, OnPreferenceChanged) {
- MockPrefNotifier notifier(&pref_service_);
+ MockPrefNotifier notifier;
+ notifier.SetPrefService(&pref_service_);
EXPECT_CALL(notifier, FireObservers(kChangedPref)).Times(1);
notifier.OnPreferenceChanged(kChangedPref);
}
TEST_F(PrefNotifierTest, OnInitializationCompleted) {
- MockPrefNotifier notifier(&pref_service_);
+ MockPrefNotifier notifier;
+ notifier.SetPrefService(&pref_service_);
content::NotificationObserverMock observer;
content::NotificationRegistrar registrar;
registrar.Add(&observer, chrome::NOTIFICATION_PREF_INITIALIZATION_COMPLETED,
@@ -95,7 +95,8 @@ TEST_F(PrefNotifierTest, AddAndRemovePrefObservers) {
const char pref_name[] = "homepage";
const char pref_name2[] = "proxy";
- MockPrefNotifier notifier(&pref_service_);
+ MockPrefNotifier notifier;
+ notifier.SetPrefService(&pref_service_);
notifier.AddPrefObserver(pref_name, &obs1_);
ASSERT_EQ(1u, notifier.CountObserver(pref_name, &obs1_));
ASSERT_EQ(0u, notifier.CountObserver(pref_name2, &obs1_));
@@ -156,7 +157,8 @@ TEST_F(PrefNotifierTest, AddAndRemovePrefObservers) {
TEST_F(PrefNotifierTest, FireObservers) {
base::FundamentalValue value_true(true);
- PrefNotifierImpl notifier(&pref_service_);
+ PrefNotifierImpl notifier;
+ notifier.SetPrefService(&pref_service_);
notifier.AddPrefObserver(kChangedPref, &obs1_);
notifier.AddPrefObserver(kUnchangedPref, &obs1_);

Powered by Google App Engine
This is Rietveld 408576698