| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 std::vector<syncer::ModelType> datatypes; | 45 std::vector<syncer::ModelType> datatypes; |
| 46 datatypes.push_back(syncer::APPS); | 46 datatypes.push_back(syncer::APPS); |
| 47 #if defined(ENABLE_APP_LIST) | 47 #if defined(ENABLE_APP_LIST) |
| 48 if (app_list::switches::IsAppListSyncEnabled()) | 48 if (app_list::switches::IsAppListSyncEnabled()) |
| 49 datatypes.push_back(syncer::APP_LIST); | 49 datatypes.push_back(syncer::APP_LIST); |
| 50 #endif | 50 #endif |
| 51 datatypes.push_back(syncer::APP_SETTINGS); | 51 datatypes.push_back(syncer::APP_SETTINGS); |
| 52 datatypes.push_back(syncer::AUTOFILL); | 52 datatypes.push_back(syncer::AUTOFILL); |
| 53 datatypes.push_back(syncer::AUTOFILL_PROFILE); | 53 datatypes.push_back(syncer::AUTOFILL_PROFILE); |
| 54 datatypes.push_back(syncer::AUTOFILL_WALLET_DATA); | 54 datatypes.push_back(syncer::AUTOFILL_WALLET_DATA); |
| 55 datatypes.push_back(syncer::AUTOFILL_WALLET_METADATA); |
| 55 datatypes.push_back(syncer::BOOKMARKS); | 56 datatypes.push_back(syncer::BOOKMARKS); |
| 56 datatypes.push_back(syncer::DEVICE_INFO); | 57 datatypes.push_back(syncer::DEVICE_INFO); |
| 57 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) | 58 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) |
| 58 datatypes.push_back(syncer::DICTIONARY); | 59 datatypes.push_back(syncer::DICTIONARY); |
| 59 #endif | 60 #endif |
| 60 datatypes.push_back(syncer::EXTENSIONS); | 61 datatypes.push_back(syncer::EXTENSIONS); |
| 61 datatypes.push_back(syncer::EXTENSION_SETTINGS); | 62 datatypes.push_back(syncer::EXTENSION_SETTINGS); |
| 62 datatypes.push_back(syncer::HISTORY_DELETE_DIRECTIVES); | 63 datatypes.push_back(syncer::HISTORY_DELETE_DIRECTIVES); |
| 63 datatypes.push_back(syncer::PASSWORDS); | 64 datatypes.push_back(syncer::PASSWORDS); |
| 64 datatypes.push_back(syncer::PREFERENCES); | 65 datatypes.push_back(syncer::PREFERENCES); |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 } | 157 } |
| 157 | 158 |
| 158 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) { | 159 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) { |
| 159 TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL)); | 160 TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL)); |
| 160 } | 161 } |
| 161 | 162 |
| 162 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) { | 163 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) { |
| 163 TestSwitchDisablesType( | 164 TestSwitchDisablesType( |
| 164 syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS)); | 165 syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS)); |
| 165 } | 166 } |
| OLD | NEW |