OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <set> | 5 #include <set> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/scoped_ptr.h" | 8 #include "base/scoped_ptr.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/browser/browser_thread.h" | 10 #include "chrome/browser/browser_thread.h" |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 pref_value_store_->RegisterPreferenceType(prefs::kStabilityLaunchCount, | 126 pref_value_store_->RegisterPreferenceType(prefs::kStabilityLaunchCount, |
127 Value::TYPE_INTEGER); | 127 Value::TYPE_INTEGER); |
128 pref_value_store_->RegisterPreferenceType(prefs::kRecommendedPref, | 128 pref_value_store_->RegisterPreferenceType(prefs::kRecommendedPref, |
129 Value::TYPE_BOOLEAN); | 129 Value::TYPE_BOOLEAN); |
130 pref_value_store_->RegisterPreferenceType(prefs::kSampleDict, | 130 pref_value_store_->RegisterPreferenceType(prefs::kSampleDict, |
131 Value::TYPE_DICTIONARY); | 131 Value::TYPE_DICTIONARY); |
132 pref_value_store_->RegisterPreferenceType(prefs::kSampleList, | 132 pref_value_store_->RegisterPreferenceType(prefs::kSampleList, |
133 Value::TYPE_LIST); | 133 Value::TYPE_LIST); |
134 pref_value_store_->RegisterPreferenceType(prefs::kDefaultPref, | 134 pref_value_store_->RegisterPreferenceType(prefs::kDefaultPref, |
135 Value::TYPE_INTEGER); | 135 Value::TYPE_INTEGER); |
136 pref_value_store_->RegisterPreferenceType(prefs::kProxyAutoDetect, | 136 pref_value_store_->RegisterPreferenceType(prefs::kProxyMode, |
137 Value::TYPE_BOOLEAN); | 137 Value::TYPE_INTEGER); |
138 } | 138 } |
139 | 139 |
140 // Creates a new dictionary and stores some sample user preferences | 140 // Creates a new dictionary and stores some sample user preferences |
141 // in it. | 141 // in it. |
142 void CreateUserPrefs() { | 142 void CreateUserPrefs() { |
143 user_pref_store_ = new TestingPrefStore; | 143 user_pref_store_ = new TestingPrefStore; |
144 user_pref_store_->SetBoolean(prefs::kDeleteCache, | 144 user_pref_store_->SetBoolean(prefs::kDeleteCache, |
145 user_pref::kDeleteCacheValue); | 145 user_pref::kDeleteCacheValue); |
146 user_pref_store_->SetInteger(prefs::kStabilityLaunchCount, | 146 user_pref_store_->SetInteger(prefs::kStabilityLaunchCount, |
147 user_pref::kStabilityLaunchCountValue); | 147 user_pref::kStabilityLaunchCountValue); |
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
831 | 831 |
832 BrowserThread::PostTask( | 832 BrowserThread::PostTask( |
833 BrowserThread::UI, FROM_HERE, | 833 BrowserThread::UI, FROM_HERE, |
834 NewRunnableMethod( | 834 NewRunnableMethod( |
835 pref_value_store_.get(), | 835 pref_value_store_.get(), |
836 &PrefValueStore::RefreshPolicyPrefs)); | 836 &PrefValueStore::RefreshPolicyPrefs)); |
837 | 837 |
838 loop_.RunAllPending(); | 838 loop_.RunAllPending(); |
839 EXPECT_EQ(expected_differing_paths_, recorder.changed_prefs()); | 839 EXPECT_EQ(expected_differing_paths_, recorder.changed_prefs()); |
840 } | 840 } |
OLD | NEW |