| 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 "chrome/browser/sync/sync_prefs.h" | 5 #include "chrome/browser/sync/sync_prefs.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 for (syncer::ModelTypeSet::Iterator it = user_visible_types.First(); | 138 for (syncer::ModelTypeSet::Iterator it = user_visible_types.First(); |
| 139 it.Good(); it.Inc()) { | 139 it.Good(); it.Inc()) { |
| 140 syncer::ModelTypeSet preferred_types; | 140 syncer::ModelTypeSet preferred_types; |
| 141 preferred_types.Put(it.Get()); | 141 preferred_types.Put(it.Get()); |
| 142 syncer::ModelTypeSet expected_preferred_types(preferred_types); | 142 syncer::ModelTypeSet expected_preferred_types(preferred_types); |
| 143 if (it.Get() == syncer::AUTOFILL) { | 143 if (it.Get() == syncer::AUTOFILL) { |
| 144 expected_preferred_types.Put(syncer::AUTOFILL_PROFILE); | 144 expected_preferred_types.Put(syncer::AUTOFILL_PROFILE); |
| 145 } | 145 } |
| 146 if (it.Get() == syncer::PREFERENCES) { | 146 if (it.Get() == syncer::PREFERENCES) { |
| 147 expected_preferred_types.Put(syncer::DICTIONARY); | 147 expected_preferred_types.Put(syncer::DICTIONARY); |
| 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_NOTIFICATIONS); | 152 expected_preferred_types.Put(syncer::APP_NOTIFICATIONS); |
| 152 expected_preferred_types.Put(syncer::APP_SETTINGS); | 153 expected_preferred_types.Put(syncer::APP_SETTINGS); |
| 153 } | 154 } |
| 154 if (it.Get() == syncer::EXTENSIONS) { | 155 if (it.Get() == syncer::EXTENSIONS) { |
| 155 expected_preferred_types.Put(syncer::EXTENSION_SETTINGS); | 156 expected_preferred_types.Put(syncer::EXTENSION_SETTINGS); |
| 156 } | 157 } |
| 157 if (it.Get() == syncer::TYPED_URLS) { | 158 if (it.Get() == syncer::TYPED_URLS) { |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 EXPECT_FALSE(sync_prefs.HasKeepEverythingSynced()); | 243 EXPECT_FALSE(sync_prefs.HasKeepEverythingSynced()); |
| 243 const syncer::ModelTypeSet user_types = syncer::UserTypes(); | 244 const syncer::ModelTypeSet user_types = syncer::UserTypes(); |
| 244 EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(user_types).Empty()); | 245 EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(user_types).Empty()); |
| 245 EXPECT_FALSE(sync_prefs.IsManaged()); | 246 EXPECT_FALSE(sync_prefs.IsManaged()); |
| 246 EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty()); | 247 EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty()); |
| 247 } | 248 } |
| 248 | 249 |
| 249 } // namespace | 250 } // namespace |
| 250 | 251 |
| 251 } // namespace browser_sync | 252 } // namespace browser_sync |
| OLD | NEW |