| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/prefs/profile_pref_store_manager.h" | 5 #include "chrome/browser/prefs/profile_pref_store_manager.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 // case... | 194 // case... |
| 195 base::RunLoop().RunUntilIdle(); | 195 base::RunLoop().RunUntilIdle(); |
| 196 } | 196 } |
| 197 } | 197 } |
| 198 | 198 |
| 199 void InitializePrefStore(PersistentPrefStore* pref_store) { | 199 void InitializePrefStore(PersistentPrefStore* pref_store) { |
| 200 pref_store->AddObserver(®istry_verifier_); | 200 pref_store->AddObserver(®istry_verifier_); |
| 201 PersistentPrefStore::PrefReadError error = pref_store->ReadPrefs(); | 201 PersistentPrefStore::PrefReadError error = pref_store->ReadPrefs(); |
| 202 EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NO_FILE, error); | 202 EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NO_FILE, error); |
| 203 pref_store->SetValue(kTrackedAtomic, | 203 pref_store->SetValue(kTrackedAtomic, |
| 204 base::WrapUnique(new base::StringValue(kFoobar)), | 204 base::MakeUnique<base::StringValue>(kFoobar), |
| 205 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); | 205 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); |
| 206 pref_store->SetValue(kProtectedAtomic, | 206 pref_store->SetValue(kProtectedAtomic, |
| 207 base::WrapUnique(new base::StringValue(kHelloWorld)), | 207 base::MakeUnique<base::StringValue>(kHelloWorld), |
| 208 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); | 208 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); |
| 209 pref_store->SetValue(kUnprotectedPref, | 209 pref_store->SetValue(kUnprotectedPref, |
| 210 base::WrapUnique(new base::StringValue(kFoobar)), | 210 base::MakeUnique<base::StringValue>(kFoobar), |
| 211 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); | 211 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); |
| 212 pref_store->RemoveObserver(®istry_verifier_); | 212 pref_store->RemoveObserver(®istry_verifier_); |
| 213 pref_store->CommitPendingWrite(); | 213 pref_store->CommitPendingWrite(); |
| 214 base::RunLoop().RunUntilIdle(); | 214 base::RunLoop().RunUntilIdle(); |
| 215 } | 215 } |
| 216 | 216 |
| 217 void LoadExistingPrefs() { | 217 void LoadExistingPrefs() { |
| 218 DestroyPrefStore(); | 218 DestroyPrefStore(); |
| 219 pref_store_ = manager_->CreateProfilePrefStore( | 219 pref_store_ = manager_->CreateProfilePrefStore( |
| 220 main_message_loop_.task_runner(), | 220 main_message_loop_.task_runner(), |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 | 483 |
| 484 // Trigger the logic that migrates it back to the unprotected preferences | 484 // Trigger the logic that migrates it back to the unprotected preferences |
| 485 // file. | 485 // file. |
| 486 pref_store_->SetValue(kProtectedAtomic, | 486 pref_store_->SetValue(kProtectedAtomic, |
| 487 base::WrapUnique(new base::StringValue(kGoodbyeWorld)), | 487 base::WrapUnique(new base::StringValue(kGoodbyeWorld)), |
| 488 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); | 488 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); |
| 489 LoadExistingPrefs(); | 489 LoadExistingPrefs(); |
| 490 ExpectStringValueEquals(kProtectedAtomic, kGoodbyeWorld); | 490 ExpectStringValueEquals(kProtectedAtomic, kGoodbyeWorld); |
| 491 VerifyResetRecorded(false); | 491 VerifyResetRecorded(false); |
| 492 } | 492 } |
| OLD | NEW |