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

Side by Side Diff: base/prefs/pref_value_store_unittest.cc

Issue 23610004: Rename managed user pref store to supervised user pref store. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 3 months 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
« no previous file with comments | « base/prefs/pref_value_store.cc ('k') | chrome/browser/prefs/pref_service_syncable.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/prefs/pref_notifier.h" 10 #include "base/prefs/pref_notifier.h"
(...skipping 19 matching lines...) Expand all
30 class MockPrefModelAssociator { 30 class MockPrefModelAssociator {
31 public: 31 public:
32 MOCK_METHOD1(ProcessPrefChange, void(const std::string&)); 32 MOCK_METHOD1(ProcessPrefChange, void(const std::string&));
33 }; 33 };
34 34
35 } // namespace 35 } // namespace
36 36
37 // Names of the preferences used in this test. 37 // Names of the preferences used in this test.
38 namespace prefs { 38 namespace prefs {
39 const char kManagedPref[] = "this.pref.managed"; 39 const char kManagedPref[] = "this.pref.managed";
40 const char kManagedUserPref[] = "this.pref.managed_user"; 40 const char kSupervisedUserPref[] = "this.pref.supervised_user";
41 const char kCommandLinePref[] = "this.pref.command_line"; 41 const char kCommandLinePref[] = "this.pref.command_line";
42 const char kExtensionPref[] = "this.pref.extension"; 42 const char kExtensionPref[] = "this.pref.extension";
43 const char kUserPref[] = "this.pref.user"; 43 const char kUserPref[] = "this.pref.user";
44 const char kRecommendedPref[] = "this.pref.recommended"; 44 const char kRecommendedPref[] = "this.pref.recommended";
45 const char kDefaultPref[] = "this.pref.default"; 45 const char kDefaultPref[] = "this.pref.default";
46 const char kMissingPref[] = "this.pref.does_not_exist"; 46 const char kMissingPref[] = "this.pref.does_not_exist";
47 } 47 }
48 48
49 // Potentially expected values of all preferences used in this test program. 49 // Potentially expected values of all preferences used in this test program.
50 namespace managed_pref { 50 namespace managed_pref {
51 const char kManagedValue[] = "managed:managed"; 51 const char kManagedValue[] = "managed:managed";
52 } 52 }
53 53
54 namespace managed_user_pref { 54 namespace supervised_user_pref {
55 const char kManagedValue[] = "managed_user:managed"; 55 const char kManagedValue[] = "supervised_user:managed";
56 const char kManagedUserValue[] = "managed_user:managed_user"; 56 const char kSupervisedUserValue[] = "supervised_user:supervised_user";
57 } 57 }
58 58
59 namespace extension_pref { 59 namespace extension_pref {
60 const char kManagedValue[] = "extension:managed"; 60 const char kManagedValue[] = "extension:managed";
61 const char kManagedUserValue[] = "extension:managed_user"; 61 const char kSupervisedUserValue[] = "extension:supervised_user";
62 const char kExtensionValue[] = "extension:extension"; 62 const char kExtensionValue[] = "extension:extension";
63 } 63 }
64 64
65 namespace command_line_pref { 65 namespace command_line_pref {
66 const char kManagedValue[] = "command_line:managed"; 66 const char kManagedValue[] = "command_line:managed";
67 const char kManagedUserValue[] = "command_line:managed_user"; 67 const char kSupervisedUserValue[] = "command_line:supervised_user";
68 const char kExtensionValue[] = "command_line:extension"; 68 const char kExtensionValue[] = "command_line:extension";
69 const char kCommandLineValue[] = "command_line:command_line"; 69 const char kCommandLineValue[] = "command_line:command_line";
70 } 70 }
71 71
72 namespace user_pref { 72 namespace user_pref {
73 const char kManagedValue[] = "user:managed"; 73 const char kManagedValue[] = "user:managed";
74 const char kManagedUserValue[] = "managed_user:managed_user"; 74 const char kSupervisedUserValue[] = "supervised_user:supervised_user";
75 const char kExtensionValue[] = "user:extension"; 75 const char kExtensionValue[] = "user:extension";
76 const char kCommandLineValue[] = "user:command_line"; 76 const char kCommandLineValue[] = "user:command_line";
77 const char kUserValue[] = "user:user"; 77 const char kUserValue[] = "user:user";
78 } 78 }
79 79
80 namespace recommended_pref { 80 namespace recommended_pref {
81 const char kManagedValue[] = "recommended:managed"; 81 const char kManagedValue[] = "recommended:managed";
82 const char kManagedUserValue[] = "recommended:managed_user"; 82 const char kSupervisedUserValue[] = "recommended:supervised_user";
83 const char kExtensionValue[] = "recommended:extension"; 83 const char kExtensionValue[] = "recommended:extension";
84 const char kCommandLineValue[] = "recommended:command_line"; 84 const char kCommandLineValue[] = "recommended:command_line";
85 const char kUserValue[] = "recommended:user"; 85 const char kUserValue[] = "recommended:user";
86 const char kRecommendedValue[] = "recommended:recommended"; 86 const char kRecommendedValue[] = "recommended:recommended";
87 } 87 }
88 88
89 namespace default_pref { 89 namespace default_pref {
90 const char kManagedValue[] = "default:managed"; 90 const char kManagedValue[] = "default:managed";
91 const char kManagedUserValue[] = "default:managed_user"; 91 const char kSupervisedUserValue[] = "default:supervised_user";
92 const char kExtensionValue[] = "default:extension"; 92 const char kExtensionValue[] = "default:extension";
93 const char kCommandLineValue[] = "default:command_line"; 93 const char kCommandLineValue[] = "default:command_line";
94 const char kUserValue[] = "default:user"; 94 const char kUserValue[] = "default:user";
95 const char kRecommendedValue[] = "default:recommended"; 95 const char kRecommendedValue[] = "default:recommended";
96 const char kDefaultValue[] = "default:default"; 96 const char kDefaultValue[] = "default:default";
97 } 97 }
98 98
99 class PrefValueStoreTest : public testing::Test { 99 class PrefValueStoreTest : public testing::Test {
100 protected: 100 protected:
101 virtual void SetUp() { 101 virtual void SetUp() {
102 // Create TestingPrefStores. 102 // Create TestingPrefStores.
103 CreateManagedPrefs(); 103 CreateManagedPrefs();
104 CreateManagedUserPrefs(); 104 CreateSupervisedUserPrefs();
105 CreateExtensionPrefs(); 105 CreateExtensionPrefs();
106 CreateCommandLinePrefs(); 106 CreateCommandLinePrefs();
107 CreateUserPrefs(); 107 CreateUserPrefs();
108 CreateRecommendedPrefs(); 108 CreateRecommendedPrefs();
109 CreateDefaultPrefs(); 109 CreateDefaultPrefs();
110 sync_associator_.reset(new MockPrefModelAssociator()); 110 sync_associator_.reset(new MockPrefModelAssociator());
111 111
112 // Create a fresh PrefValueStore. 112 // Create a fresh PrefValueStore.
113 pref_value_store_.reset(new PrefValueStore(managed_pref_store_.get(), 113 pref_value_store_.reset(
114 managed_user_pref_store_.get(), 114 new PrefValueStore(managed_pref_store_.get(),
115 extension_pref_store_.get(), 115 supervised_user_pref_store_.get(),
116 command_line_pref_store_.get(), 116 extension_pref_store_.get(),
117 user_pref_store_.get(), 117 command_line_pref_store_.get(),
118 recommended_pref_store_.get(), 118 user_pref_store_.get(),
119 default_pref_store_.get(), 119 recommended_pref_store_.get(),
120 &pref_notifier_)); 120 default_pref_store_.get(),
121 &pref_notifier_));
121 122
122 pref_value_store_->set_callback( 123 pref_value_store_->set_callback(
123 base::Bind(&MockPrefModelAssociator::ProcessPrefChange, 124 base::Bind(&MockPrefModelAssociator::ProcessPrefChange,
124 base::Unretained(sync_associator_.get()))); 125 base::Unretained(sync_associator_.get())));
125 } 126 }
126 127
127 void CreateManagedPrefs() { 128 void CreateManagedPrefs() {
128 managed_pref_store_ = new TestingPrefStore; 129 managed_pref_store_ = new TestingPrefStore;
129 managed_pref_store_->SetString( 130 managed_pref_store_->SetString(
130 prefs::kManagedPref, 131 prefs::kManagedPref,
131 managed_pref::kManagedValue); 132 managed_pref::kManagedValue);
132 } 133 }
133 134
134 void CreateManagedUserPrefs() { 135 void CreateSupervisedUserPrefs() {
135 managed_user_pref_store_ = new TestingPrefStore; 136 supervised_user_pref_store_ = new TestingPrefStore;
136 managed_user_pref_store_->SetString( 137 supervised_user_pref_store_->SetString(
137 prefs::kManagedPref, 138 prefs::kManagedPref,
138 managed_user_pref::kManagedValue); 139 supervised_user_pref::kManagedValue);
139 managed_user_pref_store_->SetString( 140 supervised_user_pref_store_->SetString(
140 prefs::kManagedUserPref, 141 prefs::kSupervisedUserPref,
141 managed_user_pref::kManagedUserValue); 142 supervised_user_pref::kSupervisedUserValue);
142 } 143 }
143 144
144 void CreateExtensionPrefs() { 145 void CreateExtensionPrefs() {
145 extension_pref_store_ = new TestingPrefStore; 146 extension_pref_store_ = new TestingPrefStore;
146 extension_pref_store_->SetString( 147 extension_pref_store_->SetString(
147 prefs::kManagedPref, 148 prefs::kManagedPref,
148 extension_pref::kManagedValue); 149 extension_pref::kManagedValue);
149 extension_pref_store_->SetString( 150 extension_pref_store_->SetString(
150 prefs::kManagedUserPref, 151 prefs::kSupervisedUserPref,
151 extension_pref::kManagedUserValue); 152 extension_pref::kSupervisedUserValue);
152 extension_pref_store_->SetString( 153 extension_pref_store_->SetString(
153 prefs::kExtensionPref, 154 prefs::kExtensionPref,
154 extension_pref::kExtensionValue); 155 extension_pref::kExtensionValue);
155 } 156 }
156 157
157 void CreateCommandLinePrefs() { 158 void CreateCommandLinePrefs() {
158 command_line_pref_store_ = new TestingPrefStore; 159 command_line_pref_store_ = new TestingPrefStore;
159 command_line_pref_store_->SetString( 160 command_line_pref_store_->SetString(
160 prefs::kManagedPref, 161 prefs::kManagedPref,
161 command_line_pref::kManagedValue); 162 command_line_pref::kManagedValue);
162 command_line_pref_store_->SetString( 163 command_line_pref_store_->SetString(
163 prefs::kManagedUserPref, 164 prefs::kSupervisedUserPref,
164 command_line_pref::kManagedUserValue); 165 command_line_pref::kSupervisedUserValue);
165 command_line_pref_store_->SetString( 166 command_line_pref_store_->SetString(
166 prefs::kExtensionPref, 167 prefs::kExtensionPref,
167 command_line_pref::kExtensionValue); 168 command_line_pref::kExtensionValue);
168 command_line_pref_store_->SetString( 169 command_line_pref_store_->SetString(
169 prefs::kCommandLinePref, 170 prefs::kCommandLinePref,
170 command_line_pref::kCommandLineValue); 171 command_line_pref::kCommandLineValue);
171 } 172 }
172 173
173 void CreateUserPrefs() { 174 void CreateUserPrefs() {
174 user_pref_store_ = new TestingPrefStore; 175 user_pref_store_ = new TestingPrefStore;
175 user_pref_store_->SetString( 176 user_pref_store_->SetString(
176 prefs::kManagedPref, 177 prefs::kManagedPref,
177 user_pref::kManagedValue); 178 user_pref::kManagedValue);
178 user_pref_store_->SetString( 179 user_pref_store_->SetString(
179 prefs::kManagedUserPref, 180 prefs::kSupervisedUserPref,
180 user_pref::kManagedUserValue); 181 user_pref::kSupervisedUserValue);
181 user_pref_store_->SetString( 182 user_pref_store_->SetString(
182 prefs::kCommandLinePref, 183 prefs::kCommandLinePref,
183 user_pref::kCommandLineValue); 184 user_pref::kCommandLineValue);
184 user_pref_store_->SetString( 185 user_pref_store_->SetString(
185 prefs::kExtensionPref, 186 prefs::kExtensionPref,
186 user_pref::kExtensionValue); 187 user_pref::kExtensionValue);
187 user_pref_store_->SetString( 188 user_pref_store_->SetString(
188 prefs::kUserPref, 189 prefs::kUserPref,
189 user_pref::kUserValue); 190 user_pref::kUserValue);
190 } 191 }
191 192
192 void CreateRecommendedPrefs() { 193 void CreateRecommendedPrefs() {
193 recommended_pref_store_ = new TestingPrefStore; 194 recommended_pref_store_ = new TestingPrefStore;
194 recommended_pref_store_->SetString( 195 recommended_pref_store_->SetString(
195 prefs::kManagedPref, 196 prefs::kManagedPref,
196 recommended_pref::kManagedValue); 197 recommended_pref::kManagedValue);
197 recommended_pref_store_->SetString( 198 recommended_pref_store_->SetString(
198 prefs::kManagedUserPref, 199 prefs::kSupervisedUserPref,
199 recommended_pref::kManagedUserValue); 200 recommended_pref::kSupervisedUserValue);
200 recommended_pref_store_->SetString( 201 recommended_pref_store_->SetString(
201 prefs::kCommandLinePref, 202 prefs::kCommandLinePref,
202 recommended_pref::kCommandLineValue); 203 recommended_pref::kCommandLineValue);
203 recommended_pref_store_->SetString( 204 recommended_pref_store_->SetString(
204 prefs::kExtensionPref, 205 prefs::kExtensionPref,
205 recommended_pref::kExtensionValue); 206 recommended_pref::kExtensionValue);
206 recommended_pref_store_->SetString( 207 recommended_pref_store_->SetString(
207 prefs::kUserPref, 208 prefs::kUserPref,
208 recommended_pref::kUserValue); 209 recommended_pref::kUserValue);
209 recommended_pref_store_->SetString( 210 recommended_pref_store_->SetString(
210 prefs::kRecommendedPref, 211 prefs::kRecommendedPref,
211 recommended_pref::kRecommendedValue); 212 recommended_pref::kRecommendedValue);
212 } 213 }
213 214
214 void CreateDefaultPrefs() { 215 void CreateDefaultPrefs() {
215 default_pref_store_ = new TestingPrefStore; 216 default_pref_store_ = new TestingPrefStore;
216 default_pref_store_->SetString( 217 default_pref_store_->SetString(
217 prefs::kManagedUserPref, 218 prefs::kSupervisedUserPref,
218 default_pref::kManagedUserValue); 219 default_pref::kSupervisedUserValue);
219 default_pref_store_->SetString( 220 default_pref_store_->SetString(
220 prefs::kManagedPref, 221 prefs::kManagedPref,
221 default_pref::kManagedValue); 222 default_pref::kManagedValue);
222 default_pref_store_->SetString( 223 default_pref_store_->SetString(
223 prefs::kCommandLinePref, 224 prefs::kCommandLinePref,
224 default_pref::kCommandLineValue); 225 default_pref::kCommandLineValue);
225 default_pref_store_->SetString( 226 default_pref_store_->SetString(
226 prefs::kExtensionPref, 227 prefs::kExtensionPref,
227 default_pref::kExtensionValue); 228 default_pref::kExtensionValue);
228 default_pref_store_->SetString( 229 default_pref_store_->SetString(
(...skipping 15 matching lines...) Expand all
244 void CheckAndClearValueChangeNotifications() { 245 void CheckAndClearValueChangeNotifications() {
245 Mock::VerifyAndClearExpectations(&pref_notifier_); 246 Mock::VerifyAndClearExpectations(&pref_notifier_);
246 Mock::VerifyAndClearExpectations(sync_associator_.get()); 247 Mock::VerifyAndClearExpectations(sync_associator_.get());
247 } 248 }
248 249
249 MockPrefNotifier pref_notifier_; 250 MockPrefNotifier pref_notifier_;
250 scoped_ptr<MockPrefModelAssociator> sync_associator_; 251 scoped_ptr<MockPrefModelAssociator> sync_associator_;
251 scoped_ptr<PrefValueStore> pref_value_store_; 252 scoped_ptr<PrefValueStore> pref_value_store_;
252 253
253 scoped_refptr<TestingPrefStore> managed_pref_store_; 254 scoped_refptr<TestingPrefStore> managed_pref_store_;
254 scoped_refptr<TestingPrefStore> managed_user_pref_store_; 255 scoped_refptr<TestingPrefStore> supervised_user_pref_store_;
255 scoped_refptr<TestingPrefStore> extension_pref_store_; 256 scoped_refptr<TestingPrefStore> extension_pref_store_;
256 scoped_refptr<TestingPrefStore> command_line_pref_store_; 257 scoped_refptr<TestingPrefStore> command_line_pref_store_;
257 scoped_refptr<TestingPrefStore> user_pref_store_; 258 scoped_refptr<TestingPrefStore> user_pref_store_;
258 scoped_refptr<TestingPrefStore> recommended_pref_store_; 259 scoped_refptr<TestingPrefStore> recommended_pref_store_;
259 scoped_refptr<TestingPrefStore> default_pref_store_; 260 scoped_refptr<TestingPrefStore> default_pref_store_;
260 }; 261 };
261 262
262 TEST_F(PrefValueStoreTest, GetValue) { 263 TEST_F(PrefValueStoreTest, GetValue) {
263 const base::Value* value; 264 const base::Value* value;
264 265
265 // The following tests read a value from the PrefService. The preferences are 266 // The following tests read a value from the PrefService. The preferences are
266 // set in a way such that all lower-priority stores have a value and we can 267 // set in a way such that all lower-priority stores have a value and we can
267 // test whether overrides work correctly. 268 // test whether overrides work correctly.
268 269
269 // Test getting a managed value. 270 // Test getting a managed value.
270 value = NULL; 271 value = NULL;
271 ASSERT_TRUE(pref_value_store_->GetValue(prefs::kManagedPref, 272 ASSERT_TRUE(pref_value_store_->GetValue(prefs::kManagedPref,
272 base::Value::TYPE_STRING, &value)); 273 base::Value::TYPE_STRING, &value));
273 std::string actual_str_value; 274 std::string actual_str_value;
274 EXPECT_TRUE(value->GetAsString(&actual_str_value)); 275 EXPECT_TRUE(value->GetAsString(&actual_str_value));
275 EXPECT_EQ(managed_pref::kManagedValue, actual_str_value); 276 EXPECT_EQ(managed_pref::kManagedValue, actual_str_value);
276 277
277 // Test getting a managed user value. 278 // Test getting a supervised user value.
278 value = NULL; 279 value = NULL;
279 ASSERT_TRUE(pref_value_store_->GetValue(prefs::kManagedUserPref, 280 ASSERT_TRUE(pref_value_store_->GetValue(prefs::kSupervisedUserPref,
280 base::Value::TYPE_STRING, &value)); 281 base::Value::TYPE_STRING, &value));
281 EXPECT_TRUE(value->GetAsString(&actual_str_value)); 282 EXPECT_TRUE(value->GetAsString(&actual_str_value));
282 EXPECT_EQ(managed_user_pref::kManagedUserValue, actual_str_value); 283 EXPECT_EQ(supervised_user_pref::kSupervisedUserValue, actual_str_value);
283 284
284 // Test getting an extension value. 285 // Test getting an extension value.
285 value = NULL; 286 value = NULL;
286 ASSERT_TRUE(pref_value_store_->GetValue(prefs::kExtensionPref, 287 ASSERT_TRUE(pref_value_store_->GetValue(prefs::kExtensionPref,
287 base::Value::TYPE_STRING, &value)); 288 base::Value::TYPE_STRING, &value));
288 EXPECT_TRUE(value->GetAsString(&actual_str_value)); 289 EXPECT_TRUE(value->GetAsString(&actual_str_value));
289 EXPECT_EQ(extension_pref::kExtensionValue, actual_str_value); 290 EXPECT_EQ(extension_pref::kExtensionValue, actual_str_value);
290 291
291 // Test getting a command-line value. 292 // Test getting a command-line value.
292 value = NULL; 293 value = NULL;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 336
336 // Test getting recommended value when a managed value is present. 337 // Test getting recommended value when a managed value is present.
337 value = NULL; 338 value = NULL;
338 ASSERT_TRUE(pref_value_store_->GetRecommendedValue( 339 ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
339 prefs::kManagedPref, 340 prefs::kManagedPref,
340 base::Value::TYPE_STRING, &value)); 341 base::Value::TYPE_STRING, &value));
341 std::string actual_str_value; 342 std::string actual_str_value;
342 EXPECT_TRUE(value->GetAsString(&actual_str_value)); 343 EXPECT_TRUE(value->GetAsString(&actual_str_value));
343 EXPECT_EQ(recommended_pref::kManagedValue, actual_str_value); 344 EXPECT_EQ(recommended_pref::kManagedValue, actual_str_value);
344 345
345 // Test getting recommended value when a managed user value is present. 346 // Test getting recommended value when a supervised user value is present.
346 value = NULL; 347 value = NULL;
347 ASSERT_TRUE(pref_value_store_->GetRecommendedValue( 348 ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
348 prefs::kManagedUserPref, 349 prefs::kSupervisedUserPref,
349 base::Value::TYPE_STRING, &value)); 350 base::Value::TYPE_STRING, &value));
350 EXPECT_TRUE(value->GetAsString(&actual_str_value)); 351 EXPECT_TRUE(value->GetAsString(&actual_str_value));
351 EXPECT_EQ(recommended_pref::kManagedUserValue, actual_str_value); 352 EXPECT_EQ(recommended_pref::kSupervisedUserValue, actual_str_value);
352 353
353 // Test getting recommended value when an extension value is present. 354 // Test getting recommended value when an extension value is present.
354 value = NULL; 355 value = NULL;
355 ASSERT_TRUE(pref_value_store_->GetRecommendedValue( 356 ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
356 prefs::kExtensionPref, 357 prefs::kExtensionPref,
357 base::Value::TYPE_STRING, &value)); 358 base::Value::TYPE_STRING, &value));
358 EXPECT_TRUE(value->GetAsString(&actual_str_value)); 359 EXPECT_TRUE(value->GetAsString(&actual_str_value));
359 EXPECT_EQ(recommended_pref::kExtensionValue, actual_str_value); 360 EXPECT_EQ(recommended_pref::kExtensionValue, actual_str_value);
360 361
361 // Test getting recommended value when a command-line value is present. 362 // Test getting recommended value when a command-line value is present.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 ASSERT_FALSE(value); 401 ASSERT_FALSE(value);
401 } 402 }
402 403
403 TEST_F(PrefValueStoreTest, PrefChanges) { 404 TEST_F(PrefValueStoreTest, PrefChanges) {
404 // Check pref controlled by highest-priority store. 405 // Check pref controlled by highest-priority store.
405 ExpectValueChangeNotifications(prefs::kManagedPref); 406 ExpectValueChangeNotifications(prefs::kManagedPref);
406 managed_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref); 407 managed_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref);
407 CheckAndClearValueChangeNotifications(); 408 CheckAndClearValueChangeNotifications();
408 409
409 ExpectValueChangeNotifications(prefs::kManagedPref); 410 ExpectValueChangeNotifications(prefs::kManagedPref);
410 managed_user_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref); 411 supervised_user_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref);
411 CheckAndClearValueChangeNotifications(); 412 CheckAndClearValueChangeNotifications();
412 413
413 ExpectValueChangeNotifications(prefs::kManagedPref); 414 ExpectValueChangeNotifications(prefs::kManagedPref);
414 extension_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref); 415 extension_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref);
415 CheckAndClearValueChangeNotifications(); 416 CheckAndClearValueChangeNotifications();
416 417
417 ExpectValueChangeNotifications(prefs::kManagedPref); 418 ExpectValueChangeNotifications(prefs::kManagedPref);
418 command_line_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref); 419 command_line_pref_store_->NotifyPrefValueChanged(prefs::kManagedPref);
419 CheckAndClearValueChangeNotifications(); 420 CheckAndClearValueChangeNotifications();
420 421
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 CheckAndClearValueChangeNotifications(); 478 CheckAndClearValueChangeNotifications();
478 479
479 ExpectValueChangeNotifications(prefs::kDefaultPref); 480 ExpectValueChangeNotifications(prefs::kDefaultPref);
480 default_pref_store_->NotifyPrefValueChanged(prefs::kDefaultPref); 481 default_pref_store_->NotifyPrefValueChanged(prefs::kDefaultPref);
481 CheckAndClearValueChangeNotifications(); 482 CheckAndClearValueChangeNotifications();
482 } 483 }
483 484
484 TEST_F(PrefValueStoreTest, OnInitializationCompleted) { 485 TEST_F(PrefValueStoreTest, OnInitializationCompleted) {
485 EXPECT_CALL(pref_notifier_, OnInitializationCompleted(true)).Times(0); 486 EXPECT_CALL(pref_notifier_, OnInitializationCompleted(true)).Times(0);
486 managed_pref_store_->SetInitializationCompleted(); 487 managed_pref_store_->SetInitializationCompleted();
487 managed_user_pref_store_->SetInitializationCompleted(); 488 supervised_user_pref_store_->SetInitializationCompleted();
488 extension_pref_store_->SetInitializationCompleted(); 489 extension_pref_store_->SetInitializationCompleted();
489 command_line_pref_store_->SetInitializationCompleted(); 490 command_line_pref_store_->SetInitializationCompleted();
490 recommended_pref_store_->SetInitializationCompleted(); 491 recommended_pref_store_->SetInitializationCompleted();
491 default_pref_store_->SetInitializationCompleted(); 492 default_pref_store_->SetInitializationCompleted();
492 Mock::VerifyAndClearExpectations(&pref_notifier_); 493 Mock::VerifyAndClearExpectations(&pref_notifier_);
493 494
494 // The notification should only be triggered after the last store is done. 495 // The notification should only be triggered after the last store is done.
495 EXPECT_CALL(pref_notifier_, OnInitializationCompleted(true)).Times(1); 496 EXPECT_CALL(pref_notifier_, OnInitializationCompleted(true)).Times(1);
496 user_pref_store_->SetInitializationCompleted(); 497 user_pref_store_->SetInitializationCompleted();
497 Mock::VerifyAndClearExpectations(&pref_notifier_); 498 Mock::VerifyAndClearExpectations(&pref_notifier_);
498 } 499 }
499 500
500 TEST_F(PrefValueStoreTest, PrefValueInManagedStore) { 501 TEST_F(PrefValueStoreTest, PrefValueInManagedStore) {
501 EXPECT_TRUE(pref_value_store_->PrefValueInManagedStore( 502 EXPECT_TRUE(pref_value_store_->PrefValueInManagedStore(
502 prefs::kManagedPref)); 503 prefs::kManagedPref));
503 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( 504 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
504 prefs::kManagedUserPref)); 505 prefs::kSupervisedUserPref));
505 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( 506 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
506 prefs::kExtensionPref)); 507 prefs::kExtensionPref));
507 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( 508 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
508 prefs::kCommandLinePref)); 509 prefs::kCommandLinePref));
509 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( 510 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
510 prefs::kUserPref)); 511 prefs::kUserPref));
511 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( 512 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
512 prefs::kRecommendedPref)); 513 prefs::kRecommendedPref));
513 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( 514 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
514 prefs::kDefaultPref)); 515 prefs::kDefaultPref));
515 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore( 516 EXPECT_FALSE(pref_value_store_->PrefValueInManagedStore(
516 prefs::kMissingPref)); 517 prefs::kMissingPref));
517 } 518 }
518 519
519 TEST_F(PrefValueStoreTest, PrefValueInExtensionStore) { 520 TEST_F(PrefValueStoreTest, PrefValueInExtensionStore) {
520 EXPECT_TRUE(pref_value_store_->PrefValueInExtensionStore( 521 EXPECT_TRUE(pref_value_store_->PrefValueInExtensionStore(
521 prefs::kManagedPref)); 522 prefs::kManagedPref));
522 EXPECT_TRUE(pref_value_store_->PrefValueInExtensionStore( 523 EXPECT_TRUE(pref_value_store_->PrefValueInExtensionStore(
523 prefs::kManagedUserPref)); 524 prefs::kSupervisedUserPref));
524 EXPECT_TRUE(pref_value_store_->PrefValueInExtensionStore( 525 EXPECT_TRUE(pref_value_store_->PrefValueInExtensionStore(
525 prefs::kExtensionPref)); 526 prefs::kExtensionPref));
526 EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore( 527 EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore(
527 prefs::kCommandLinePref)); 528 prefs::kCommandLinePref));
528 EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore( 529 EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore(
529 prefs::kUserPref)); 530 prefs::kUserPref));
530 EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore( 531 EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore(
531 prefs::kRecommendedPref)); 532 prefs::kRecommendedPref));
532 EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore( 533 EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore(
533 prefs::kDefaultPref)); 534 prefs::kDefaultPref));
534 EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore( 535 EXPECT_FALSE(pref_value_store_->PrefValueInExtensionStore(
535 prefs::kMissingPref)); 536 prefs::kMissingPref));
536 } 537 }
537 538
538 TEST_F(PrefValueStoreTest, PrefValueInUserStore) { 539 TEST_F(PrefValueStoreTest, PrefValueInUserStore) {
539 EXPECT_TRUE(pref_value_store_->PrefValueInUserStore( 540 EXPECT_TRUE(pref_value_store_->PrefValueInUserStore(
540 prefs::kManagedPref)); 541 prefs::kManagedPref));
541 EXPECT_TRUE(pref_value_store_->PrefValueInUserStore( 542 EXPECT_TRUE(pref_value_store_->PrefValueInUserStore(
542 prefs::kManagedUserPref)); 543 prefs::kSupervisedUserPref));
543 EXPECT_TRUE(pref_value_store_->PrefValueInUserStore( 544 EXPECT_TRUE(pref_value_store_->PrefValueInUserStore(
544 prefs::kExtensionPref)); 545 prefs::kExtensionPref));
545 EXPECT_TRUE(pref_value_store_->PrefValueInUserStore( 546 EXPECT_TRUE(pref_value_store_->PrefValueInUserStore(
546 prefs::kCommandLinePref)); 547 prefs::kCommandLinePref));
547 EXPECT_TRUE(pref_value_store_->PrefValueInUserStore( 548 EXPECT_TRUE(pref_value_store_->PrefValueInUserStore(
548 prefs::kUserPref)); 549 prefs::kUserPref));
549 EXPECT_FALSE(pref_value_store_->PrefValueInUserStore( 550 EXPECT_FALSE(pref_value_store_->PrefValueInUserStore(
550 prefs::kRecommendedPref)); 551 prefs::kRecommendedPref));
551 EXPECT_FALSE(pref_value_store_->PrefValueInUserStore( 552 EXPECT_FALSE(pref_value_store_->PrefValueInUserStore(
552 prefs::kDefaultPref)); 553 prefs::kDefaultPref));
553 EXPECT_FALSE(pref_value_store_->PrefValueInUserStore( 554 EXPECT_FALSE(pref_value_store_->PrefValueInUserStore(
554 prefs::kMissingPref)); 555 prefs::kMissingPref));
555 } 556 }
556 557
557 TEST_F(PrefValueStoreTest, PrefValueFromExtensionStore) { 558 TEST_F(PrefValueStoreTest, PrefValueFromExtensionStore) {
558 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( 559 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore(
559 prefs::kManagedPref)); 560 prefs::kManagedPref));
560 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( 561 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore(
561 prefs::kManagedUserPref)); 562 prefs::kSupervisedUserPref));
562 EXPECT_TRUE(pref_value_store_->PrefValueFromExtensionStore( 563 EXPECT_TRUE(pref_value_store_->PrefValueFromExtensionStore(
563 prefs::kExtensionPref)); 564 prefs::kExtensionPref));
564 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( 565 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore(
565 prefs::kCommandLinePref)); 566 prefs::kCommandLinePref));
566 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( 567 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore(
567 prefs::kUserPref)); 568 prefs::kUserPref));
568 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( 569 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore(
569 prefs::kRecommendedPref)); 570 prefs::kRecommendedPref));
570 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( 571 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore(
571 prefs::kDefaultPref)); 572 prefs::kDefaultPref));
572 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore( 573 EXPECT_FALSE(pref_value_store_->PrefValueFromExtensionStore(
573 prefs::kMissingPref)); 574 prefs::kMissingPref));
574 } 575 }
575 576
576 TEST_F(PrefValueStoreTest, PrefValueFromUserStore) { 577 TEST_F(PrefValueStoreTest, PrefValueFromUserStore) {
577 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 578 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
578 prefs::kManagedPref)); 579 prefs::kManagedPref));
579 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 580 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
580 prefs::kManagedUserPref)); 581 prefs::kSupervisedUserPref));
581 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 582 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
582 prefs::kExtensionPref)); 583 prefs::kExtensionPref));
583 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 584 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
584 prefs::kCommandLinePref)); 585 prefs::kCommandLinePref));
585 EXPECT_TRUE(pref_value_store_->PrefValueFromUserStore( 586 EXPECT_TRUE(pref_value_store_->PrefValueFromUserStore(
586 prefs::kUserPref)); 587 prefs::kUserPref));
587 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 588 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
588 prefs::kRecommendedPref)); 589 prefs::kRecommendedPref));
589 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 590 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
590 prefs::kDefaultPref)); 591 prefs::kDefaultPref));
591 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 592 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
592 prefs::kMissingPref)); 593 prefs::kMissingPref));
593 } 594 }
594 595
595 TEST_F(PrefValueStoreTest, PrefValueFromRecommendedStore) { 596 TEST_F(PrefValueStoreTest, PrefValueFromRecommendedStore) {
596 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( 597 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
597 prefs::kManagedPref)); 598 prefs::kManagedPref));
598 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( 599 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
599 prefs::kManagedUserPref)); 600 prefs::kSupervisedUserPref));
600 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( 601 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
601 prefs::kExtensionPref)); 602 prefs::kExtensionPref));
602 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( 603 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
603 prefs::kCommandLinePref)); 604 prefs::kCommandLinePref));
604 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( 605 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
605 prefs::kUserPref)); 606 prefs::kUserPref));
606 EXPECT_TRUE(pref_value_store_->PrefValueFromRecommendedStore( 607 EXPECT_TRUE(pref_value_store_->PrefValueFromRecommendedStore(
607 prefs::kRecommendedPref)); 608 prefs::kRecommendedPref));
608 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( 609 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
609 prefs::kDefaultPref)); 610 prefs::kDefaultPref));
610 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore( 611 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
611 prefs::kMissingPref)); 612 prefs::kMissingPref));
612 } 613 }
613 614
614 TEST_F(PrefValueStoreTest, PrefValueFromDefaultStore) { 615 TEST_F(PrefValueStoreTest, PrefValueFromDefaultStore) {
615 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 616 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
616 prefs::kManagedPref)); 617 prefs::kManagedPref));
617 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 618 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
618 prefs::kManagedUserPref)); 619 prefs::kSupervisedUserPref));
619 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 620 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
620 prefs::kExtensionPref)); 621 prefs::kExtensionPref));
621 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 622 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
622 prefs::kCommandLinePref)); 623 prefs::kCommandLinePref));
623 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 624 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
624 prefs::kUserPref)); 625 prefs::kUserPref));
625 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 626 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
626 prefs::kRecommendedPref)); 627 prefs::kRecommendedPref));
627 EXPECT_TRUE(pref_value_store_->PrefValueFromDefaultStore( 628 EXPECT_TRUE(pref_value_store_->PrefValueFromDefaultStore(
628 prefs::kDefaultPref)); 629 prefs::kDefaultPref));
629 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 630 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
630 prefs::kMissingPref)); 631 prefs::kMissingPref));
631 } 632 }
632 633
633 TEST_F(PrefValueStoreTest, PrefValueUserModifiable) { 634 TEST_F(PrefValueStoreTest, PrefValueUserModifiable) {
634 EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable( 635 EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable(
635 prefs::kManagedPref)); 636 prefs::kManagedPref));
636 EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable( 637 EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable(
637 prefs::kManagedUserPref)); 638 prefs::kSupervisedUserPref));
638 EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable( 639 EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable(
639 prefs::kExtensionPref)); 640 prefs::kExtensionPref));
640 EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable( 641 EXPECT_FALSE(pref_value_store_->PrefValueUserModifiable(
641 prefs::kCommandLinePref)); 642 prefs::kCommandLinePref));
642 EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable( 643 EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable(
643 prefs::kUserPref)); 644 prefs::kUserPref));
644 EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable( 645 EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable(
645 prefs::kRecommendedPref)); 646 prefs::kRecommendedPref));
646 EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable( 647 EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable(
647 prefs::kDefaultPref)); 648 prefs::kDefaultPref));
648 EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable( 649 EXPECT_TRUE(pref_value_store_->PrefValueUserModifiable(
649 prefs::kMissingPref)); 650 prefs::kMissingPref));
650 } 651 }
651 652
652 TEST_F(PrefValueStoreTest, PrefValueExtensionModifiable) { 653 TEST_F(PrefValueStoreTest, PrefValueExtensionModifiable) {
653 EXPECT_FALSE(pref_value_store_->PrefValueExtensionModifiable( 654 EXPECT_FALSE(pref_value_store_->PrefValueExtensionModifiable(
654 prefs::kManagedPref)); 655 prefs::kManagedPref));
655 EXPECT_FALSE(pref_value_store_->PrefValueExtensionModifiable( 656 EXPECT_FALSE(pref_value_store_->PrefValueExtensionModifiable(
656 prefs::kManagedUserPref)); 657 prefs::kSupervisedUserPref));
657 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( 658 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
658 prefs::kExtensionPref)); 659 prefs::kExtensionPref));
659 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( 660 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
660 prefs::kCommandLinePref)); 661 prefs::kCommandLinePref));
661 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( 662 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
662 prefs::kUserPref)); 663 prefs::kUserPref));
663 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( 664 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
664 prefs::kRecommendedPref)); 665 prefs::kRecommendedPref));
665 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( 666 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
666 prefs::kDefaultPref)); 667 prefs::kDefaultPref));
667 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( 668 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
668 prefs::kMissingPref)); 669 prefs::kMissingPref));
669 } 670 }
OLDNEW
« no previous file with comments | « base/prefs/pref_value_store.cc ('k') | chrome/browser/prefs/pref_service_syncable.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698