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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 static std::vector<syncer::ModelType> DefaultDatatypes() { | 42 static std::vector<syncer::ModelType> DefaultDatatypes() { |
43 std::vector<syncer::ModelType> datatypes; | 43 std::vector<syncer::ModelType> datatypes; |
44 datatypes.push_back(syncer::APPS); | 44 datatypes.push_back(syncer::APPS); |
45 #if defined(ENABLE_APP_LIST) | 45 #if defined(ENABLE_APP_LIST) |
46 if (app_list::switches::IsAppListSyncEnabled()) | 46 if (app_list::switches::IsAppListSyncEnabled()) |
47 datatypes.push_back(syncer::APP_LIST); | 47 datatypes.push_back(syncer::APP_LIST); |
48 #endif | 48 #endif |
49 datatypes.push_back(syncer::APP_SETTINGS); | 49 datatypes.push_back(syncer::APP_SETTINGS); |
50 datatypes.push_back(syncer::AUTOFILL); | 50 datatypes.push_back(syncer::AUTOFILL); |
51 datatypes.push_back(syncer::AUTOFILL_PROFILE); | 51 datatypes.push_back(syncer::AUTOFILL_PROFILE); |
| 52 datatypes.push_back(syncer::AUTOFILL_WALLET_DATA); |
52 datatypes.push_back(syncer::BOOKMARKS); | 53 datatypes.push_back(syncer::BOOKMARKS); |
53 datatypes.push_back(syncer::DEVICE_INFO); | 54 datatypes.push_back(syncer::DEVICE_INFO); |
54 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) | 55 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) |
55 datatypes.push_back(syncer::DICTIONARY); | 56 datatypes.push_back(syncer::DICTIONARY); |
56 #endif | 57 #endif |
57 datatypes.push_back(syncer::EXTENSIONS); | 58 datatypes.push_back(syncer::EXTENSIONS); |
58 datatypes.push_back(syncer::EXTENSION_SETTINGS); | 59 datatypes.push_back(syncer::EXTENSION_SETTINGS); |
59 datatypes.push_back(syncer::HISTORY_DELETE_DIRECTIVES); | 60 datatypes.push_back(syncer::HISTORY_DELETE_DIRECTIVES); |
60 datatypes.push_back(syncer::PASSWORDS); | 61 datatypes.push_back(syncer::PASSWORDS); |
61 datatypes.push_back(syncer::PREFERENCES); | 62 datatypes.push_back(syncer::PREFERENCES); |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 } | 156 } |
156 | 157 |
157 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) { | 158 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) { |
158 TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL)); | 159 TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL)); |
159 } | 160 } |
160 | 161 |
161 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) { | 162 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) { |
162 TestSwitchDisablesType( | 163 TestSwitchDisablesType( |
163 syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS)); | 164 syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS)); |
164 } | 165 } |
OLD | NEW |