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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/files/file_enumerator.h" | 10 #include "base/files/file_enumerator.h" |
11 #include "base/files/file_util.h" | 11 #include "base/files/file_util.h" |
12 #include "base/files/scoped_temp_dir.h" | 12 #include "base/files/scoped_temp_dir.h" |
13 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/prefs/json_pref_store.h" | 15 #include "base/prefs/json_pref_store.h" |
16 #include "base/prefs/persistent_pref_store.h" | 16 #include "base/prefs/persistent_pref_store.h" |
17 #include "base/prefs/pref_service.h" | 17 #include "base/prefs/pref_service.h" |
18 #include "base/prefs/pref_service_factory.h" | 18 #include "base/prefs/pref_service_factory.h" |
19 #include "base/prefs/pref_store.h" | 19 #include "base/prefs/pref_store.h" |
20 #include "base/prefs/testing_pref_service.h" | 20 #include "base/prefs/testing_pref_service.h" |
21 #include "base/run_loop.h" | 21 #include "base/run_loop.h" |
22 #include "base/strings/string_util.h" | 22 #include "base/strings/string_util.h" |
23 #include "base/values.h" | 23 #include "base/values.h" |
24 #include "chrome/browser/prefs/tracked/mock_validation_delegate.h" | |
25 #include "chrome/browser/prefs/tracked/pref_hash_filter.h" | |
26 #include "chrome/browser/prefs/tracked/pref_service_hash_store_contents.h" | |
27 #include "chrome/common/pref_names.h" | |
28 #include "components/pref_registry/pref_registry_syncable.h" | 24 #include "components/pref_registry/pref_registry_syncable.h" |
| 25 #include "components/user_prefs/tracked/mock_validation_delegate.h" |
| 26 #include "components/user_prefs/tracked/pref_hash_filter.h" |
| 27 #include "components/user_prefs/tracked/pref_names.h" |
| 28 #include "components/user_prefs/tracked/pref_service_hash_store_contents.h" |
29 #include "testing/gtest/include/gtest/gtest.h" | 29 #include "testing/gtest/include/gtest/gtest.h" |
30 | 30 |
31 namespace { | 31 namespace { |
32 | 32 |
33 class FirstEqualsPredicate { | 33 class FirstEqualsPredicate { |
34 public: | 34 public: |
35 explicit FirstEqualsPredicate(const std::string& expected) | 35 explicit FirstEqualsPredicate(const std::string& expected) |
36 : expected_(expected) {} | 36 : expected_(expected) {} |
37 bool operator()(const std::pair<std::string, base::Value*>& pair) { | 37 bool operator()(const std::pair<std::string, base::Value*>& pair) { |
38 return pair.first == expected_; | 38 return pair.first == expected_; |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 } | 107 } |
108 } | 108 } |
109 profile_pref_registry_->RegisterStringPref(kUnprotectedPref, std::string()); | 109 profile_pref_registry_->RegisterStringPref(kUnprotectedPref, std::string()); |
110 | 110 |
111 // As in chrome_pref_service_factory.cc, kPreferencesResetTime needs to be | 111 // As in chrome_pref_service_factory.cc, kPreferencesResetTime needs to be |
112 // declared as protected in order to be read from the proper store by the | 112 // declared as protected in order to be read from the proper store by the |
113 // SegregatedPrefStore. Only declare it after configured prefs have been | 113 // SegregatedPrefStore. Only declare it after configured prefs have been |
114 // registered above for this test as kPreferenceResetTime is already | 114 // registered above for this test as kPreferenceResetTime is already |
115 // registered in ProfilePrefStoreManager::RegisterProfilePrefs. | 115 // registered in ProfilePrefStoreManager::RegisterProfilePrefs. |
116 PrefHashFilter::TrackedPreferenceMetadata pref_reset_time_config = | 116 PrefHashFilter::TrackedPreferenceMetadata pref_reset_time_config = |
117 {configuration_.rbegin()->reporting_id + 1, prefs::kPreferenceResetTime, | 117 {configuration_.rbegin()->reporting_id + 1, |
| 118 user_prefs::kPreferenceResetTime, |
118 PrefHashFilter::ENFORCE_ON_LOAD, | 119 PrefHashFilter::ENFORCE_ON_LOAD, |
119 PrefHashFilter::TRACKING_STRATEGY_ATOMIC}; | 120 PrefHashFilter::TRACKING_STRATEGY_ATOMIC}; |
120 configuration_.push_back(pref_reset_time_config); | 121 configuration_.push_back(pref_reset_time_config); |
121 | 122 |
122 ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); | 123 ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); |
123 ReloadConfiguration(); | 124 ReloadConfiguration(); |
124 } | 125 } |
125 | 126 |
126 void ReloadConfiguration() { | 127 void ReloadConfiguration() { |
127 manager_.reset(new ProfilePrefStoreManager(profile_dir_.path(), | 128 manager_.reset(new ProfilePrefStoreManager(profile_dir_.path(), |
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
578 | 579 |
579 // Trigger the logic that migrates it back to the unprotected preferences | 580 // Trigger the logic that migrates it back to the unprotected preferences |
580 // file. | 581 // file. |
581 pref_store_->SetValue(kProtectedAtomic, | 582 pref_store_->SetValue(kProtectedAtomic, |
582 make_scoped_ptr(new base::StringValue(kGoodbyeWorld)), | 583 make_scoped_ptr(new base::StringValue(kGoodbyeWorld)), |
583 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); | 584 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); |
584 LoadExistingPrefs(); | 585 LoadExistingPrefs(); |
585 ExpectStringValueEquals(kProtectedAtomic, kGoodbyeWorld); | 586 ExpectStringValueEquals(kProtectedAtomic, kGoodbyeWorld); |
586 VerifyResetRecorded(false); | 587 VerifyResetRecorded(false); |
587 } | 588 } |
OLD | NEW |