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

Side by Side Diff: components/prefs/pref_service_unittest.cc

Issue 1907043002: Convert //components/prefs from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU fixes Created 4 years, 8 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
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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 // values to it. 236 // values to it.
237 class WriteFlagChecker : public TestingPrefStore { 237 class WriteFlagChecker : public TestingPrefStore {
238 public: 238 public:
239 WriteFlagChecker() {} 239 WriteFlagChecker() {}
240 240
241 void ReportValueChanged(const std::string& key, uint32_t flags) override { 241 void ReportValueChanged(const std::string& key, uint32_t flags) override {
242 SetLastWriteFlags(flags); 242 SetLastWriteFlags(flags);
243 } 243 }
244 244
245 void SetValue(const std::string& key, 245 void SetValue(const std::string& key,
246 scoped_ptr<base::Value> value, 246 std::unique_ptr<base::Value> value,
247 uint32_t flags) override { 247 uint32_t flags) override {
248 SetLastWriteFlags(flags); 248 SetLastWriteFlags(flags);
249 } 249 }
250 250
251 void SetValueSilently(const std::string& key, 251 void SetValueSilently(const std::string& key,
252 scoped_ptr<base::Value> value, 252 std::unique_ptr<base::Value> value,
253 uint32_t flags) override { 253 uint32_t flags) override {
254 SetLastWriteFlags(flags); 254 SetLastWriteFlags(flags);
255 } 255 }
256 256
257 void RemoveValue(const std::string& key, uint32_t flags) override { 257 void RemoveValue(const std::string& key, uint32_t flags) override {
258 SetLastWriteFlags(flags); 258 SetLastWriteFlags(flags);
259 } 259 }
260 260
261 uint32_t GetLastFlagsAndClear() { 261 uint32_t GetLastFlagsAndClear() {
262 CHECK(last_write_flags_set_); 262 CHECK(last_write_flags_set_);
(...skipping 16 matching lines...) Expand all
279 279
280 bool last_write_flags_set_ = false; 280 bool last_write_flags_set_ = false;
281 uint32_t last_write_flags_ = WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS; 281 uint32_t last_write_flags_ = WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS;
282 }; 282 };
283 283
284 TEST(PrefServiceTest, WriteablePrefStoreFlags) { 284 TEST(PrefServiceTest, WriteablePrefStoreFlags) {
285 scoped_refptr<WriteFlagChecker> flag_checker(new WriteFlagChecker); 285 scoped_refptr<WriteFlagChecker> flag_checker(new WriteFlagChecker);
286 scoped_refptr<PrefRegistrySimple> registry(new PrefRegistrySimple); 286 scoped_refptr<PrefRegistrySimple> registry(new PrefRegistrySimple);
287 PrefServiceFactory factory; 287 PrefServiceFactory factory;
288 factory.set_user_prefs(flag_checker); 288 factory.set_user_prefs(flag_checker);
289 scoped_ptr<PrefService> prefs(factory.Create(registry.get())); 289 std::unique_ptr<PrefService> prefs(factory.Create(registry.get()));
290 290
291 // The first 8 bits of write flags are reserved for subclasses. Create a 291 // The first 8 bits of write flags are reserved for subclasses. Create a
292 // custom flag in this range 292 // custom flag in this range
293 uint32_t kCustomRegistrationFlag = 1 << 2; 293 uint32_t kCustomRegistrationFlag = 1 << 2;
294 294
295 // A map of the registration flags that will be tested and the write flags 295 // A map of the registration flags that will be tested and the write flags
296 // they are expected to convert to. 296 // they are expected to convert to.
297 struct RegistrationToWriteFlags { 297 struct RegistrationToWriteFlags {
298 const char* pref_name; 298 const char* pref_name;
299 uint32_t registration_flags; 299 uint32_t registration_flags;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 421
422 EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0); 422 EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0);
423 prefs_.Set(kName, new_value); 423 prefs_.Set(kName, new_value);
424 Mock::VerifyAndClearExpectations(&observer_); 424 Mock::VerifyAndClearExpectations(&observer_);
425 425
426 base::ListValue empty; 426 base::ListValue empty;
427 observer_.Expect(kName, &empty); 427 observer_.Expect(kName, &empty);
428 prefs_.Set(kName, empty); 428 prefs_.Set(kName, empty);
429 Mock::VerifyAndClearExpectations(&observer_); 429 Mock::VerifyAndClearExpectations(&observer_);
430 } 430 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698