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

Side by Side Diff: chrome/browser/prefs/scoped_user_pref_update_unittest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments. Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/prefs/public/pref_change_registrar.h" 5 #include "base/prefs/public/pref_change_registrar.h"
6 #include "chrome/browser/prefs/mock_pref_change_callback.h" 6 #include "chrome/browser/prefs/mock_pref_change_callback.h"
7 #include "chrome/browser/prefs/scoped_user_pref_update.h" 7 #include "chrome/browser/prefs/scoped_user_pref_update.h"
8 #include "chrome/test/base/testing_pref_service.h" 8 #include "chrome/test/base/testing_pref_service.h"
9 #include "testing/gmock/include/gmock/gmock.h" 9 #include "testing/gmock/include/gmock/gmock.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 11
12 using testing::_; 12 using testing::_;
13 using testing::Mock; 13 using testing::Mock;
14 14
15 class ScopedUserPrefUpdateTest : public testing::Test { 15 class ScopedUserPrefUpdateTest : public testing::Test {
16 public: 16 public:
17 ScopedUserPrefUpdateTest() : observer_(&prefs_) {} 17 ScopedUserPrefUpdateTest() : observer_(&prefs_) {}
18 ~ScopedUserPrefUpdateTest() {} 18 ~ScopedUserPrefUpdateTest() {}
19 19
20 protected: 20 protected:
21 virtual void SetUp() { 21 virtual void SetUp() {
22 prefs_.RegisterDictionaryPref(kPref, PrefService::UNSYNCABLE_PREF); 22 prefs_.RegisterDictionaryPref(kPref,
23 PrefServiceSyncable::UNSYNCABLE_PREF);
23 registrar_.Init(&prefs_); 24 registrar_.Init(&prefs_);
24 registrar_.Add(kPref, observer_.GetCallback()); 25 registrar_.Add(kPref, observer_.GetCallback());
25 } 26 }
26 27
27 static const char kPref[]; 28 static const char kPref[];
28 static const char kKey[]; 29 static const char kKey[];
29 static const char kValue[]; 30 static const char kValue[];
30 31
31 TestingPrefService prefs_; 32 TestingPrefServiceSyncable prefs_;
32 MockPrefChangeCallback observer_; 33 MockPrefChangeCallback observer_;
33 PrefChangeRegistrar registrar_; 34 PrefChangeRegistrar registrar_;
34 }; 35 };
35 36
36 const char ScopedUserPrefUpdateTest::kPref[] = "name"; 37 const char ScopedUserPrefUpdateTest::kPref[] = "name";
37 const char ScopedUserPrefUpdateTest::kKey[] = "key"; 38 const char ScopedUserPrefUpdateTest::kKey[] = "key";
38 const char ScopedUserPrefUpdateTest::kValue[] = "value"; 39 const char ScopedUserPrefUpdateTest::kValue[] = "value";
39 40
40 TEST_F(ScopedUserPrefUpdateTest, RegularUse) { 41 TEST_F(ScopedUserPrefUpdateTest, RegularUse) {
41 // Dictionary that will be expected to be set at the end. 42 // Dictionary that will be expected to be set at the end.
(...skipping 29 matching lines...) Expand all
71 TEST_F(ScopedUserPrefUpdateTest, NeverTouchAnything) { 72 TEST_F(ScopedUserPrefUpdateTest, NeverTouchAnything) {
72 const DictionaryValue* old_value = prefs_.GetDictionary(kPref); 73 const DictionaryValue* old_value = prefs_.GetDictionary(kPref);
73 EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0); 74 EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0);
74 { 75 {
75 DictionaryPrefUpdate update(&prefs_, kPref); 76 DictionaryPrefUpdate update(&prefs_, kPref);
76 } 77 }
77 const DictionaryValue* new_value = prefs_.GetDictionary(kPref); 78 const DictionaryValue* new_value = prefs_.GetDictionary(kPref);
78 EXPECT_EQ(old_value, new_value); 79 EXPECT_EQ(old_value, new_value);
79 Mock::VerifyAndClearExpectations(&observer_); 80 Mock::VerifyAndClearExpectations(&observer_);
80 } 81 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698