| OLD | NEW |
| 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 "components/sync_driver/sync_prefs.h" | 5 #include "components/sync_driver/sync_prefs.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/prefs/pref_notifier_impl.h" | 9 #include "base/prefs/pref_notifier_impl.h" |
| 10 #include "base/prefs/pref_value_store.h" | 10 #include "base/prefs/pref_value_store.h" |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 const syncer::ModelTypeSet user_visible_types = syncer::UserSelectableTypes(); | 134 const syncer::ModelTypeSet user_visible_types = syncer::UserSelectableTypes(); |
| 135 for (syncer::ModelTypeSet::Iterator it = user_visible_types.First(); | 135 for (syncer::ModelTypeSet::Iterator it = user_visible_types.First(); |
| 136 it.Good(); | 136 it.Good(); |
| 137 it.Inc()) { | 137 it.Inc()) { |
| 138 syncer::ModelTypeSet preferred_types; | 138 syncer::ModelTypeSet preferred_types; |
| 139 preferred_types.Put(it.Get()); | 139 preferred_types.Put(it.Get()); |
| 140 syncer::ModelTypeSet expected_preferred_types(preferred_types); | 140 syncer::ModelTypeSet expected_preferred_types(preferred_types); |
| 141 if (it.Get() == syncer::AUTOFILL) { | 141 if (it.Get() == syncer::AUTOFILL) { |
| 142 expected_preferred_types.Put(syncer::AUTOFILL_PROFILE); | 142 expected_preferred_types.Put(syncer::AUTOFILL_PROFILE); |
| 143 expected_preferred_types.Put(syncer::AUTOFILL_WALLET_DATA); | 143 expected_preferred_types.Put(syncer::AUTOFILL_WALLET_DATA); |
| 144 expected_preferred_types.Put(syncer::AUTOFILL_WALLET_METADATA); |
| 144 } | 145 } |
| 145 if (it.Get() == syncer::PREFERENCES) { | 146 if (it.Get() == syncer::PREFERENCES) { |
| 146 expected_preferred_types.Put(syncer::DICTIONARY); | 147 expected_preferred_types.Put(syncer::DICTIONARY); |
| 147 expected_preferred_types.Put(syncer::PRIORITY_PREFERENCES); | 148 expected_preferred_types.Put(syncer::PRIORITY_PREFERENCES); |
| 148 expected_preferred_types.Put(syncer::SEARCH_ENGINES); | 149 expected_preferred_types.Put(syncer::SEARCH_ENGINES); |
| 149 } | 150 } |
| 150 if (it.Get() == syncer::APPS) { | 151 if (it.Get() == syncer::APPS) { |
| 151 expected_preferred_types.Put(syncer::APP_LIST); | 152 expected_preferred_types.Put(syncer::APP_LIST); |
| 152 expected_preferred_types.Put(syncer::APP_NOTIFICATIONS); | 153 expected_preferred_types.Put(syncer::APP_NOTIFICATIONS); |
| 153 expected_preferred_types.Put(syncer::APP_SETTINGS); | 154 expected_preferred_types.Put(syncer::APP_SETTINGS); |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(syncer::UserTypes()) | 233 EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(syncer::UserTypes()) |
| 233 .Has(syncer::DEVICE_INFO)); | 234 .Has(syncer::DEVICE_INFO)); |
| 234 sync_prefs.SetKeepEverythingSynced(false); | 235 sync_prefs.SetKeepEverythingSynced(false); |
| 235 EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(syncer::UserTypes()) | 236 EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(syncer::UserTypes()) |
| 236 .Has(syncer::DEVICE_INFO)); | 237 .Has(syncer::DEVICE_INFO)); |
| 237 } | 238 } |
| 238 | 239 |
| 239 } // namespace | 240 } // namespace |
| 240 | 241 |
| 241 } // namespace sync_driver | 242 } // namespace sync_driver |
| OLD | NEW |