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.h" | 10 #include "base/message_loop.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 datatypes.push_back(syncer::APPS); | 38 datatypes.push_back(syncer::APPS); |
39 datatypes.push_back(syncer::APP_SETTINGS); | 39 datatypes.push_back(syncer::APP_SETTINGS); |
40 datatypes.push_back(syncer::AUTOFILL); | 40 datatypes.push_back(syncer::AUTOFILL); |
41 datatypes.push_back(syncer::AUTOFILL_PROFILE); | 41 datatypes.push_back(syncer::AUTOFILL_PROFILE); |
42 datatypes.push_back(syncer::BOOKMARKS); | 42 datatypes.push_back(syncer::BOOKMARKS); |
43 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) | 43 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) |
44 datatypes.push_back(syncer::DICTIONARY); | 44 datatypes.push_back(syncer::DICTIONARY); |
45 #endif | 45 #endif |
46 datatypes.push_back(syncer::EXTENSIONS); | 46 datatypes.push_back(syncer::EXTENSIONS); |
47 datatypes.push_back(syncer::EXTENSION_SETTINGS); | 47 datatypes.push_back(syncer::EXTENSION_SETTINGS); |
| 48 datatypes.push_back(syncer::HISTORY_DELETE_DIRECTIVES); |
48 datatypes.push_back(syncer::PASSWORDS); | 49 datatypes.push_back(syncer::PASSWORDS); |
49 datatypes.push_back(syncer::PREFERENCES); | 50 datatypes.push_back(syncer::PREFERENCES); |
50 datatypes.push_back(syncer::PRIORITY_PREFERENCES); | 51 datatypes.push_back(syncer::PRIORITY_PREFERENCES); |
51 datatypes.push_back(syncer::SEARCH_ENGINES); | 52 datatypes.push_back(syncer::SEARCH_ENGINES); |
52 datatypes.push_back(syncer::SESSIONS); | 53 datatypes.push_back(syncer::SESSIONS); |
53 if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN || | 54 if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN || |
54 channel == chrome::VersionInfo::CHANNEL_DEV || | 55 channel == chrome::VersionInfo::CHANNEL_DEV || |
55 channel == chrome::VersionInfo::CHANNEL_CANARY) { | 56 channel == chrome::VersionInfo::CHANNEL_CANARY) { |
56 datatypes.push_back(syncer::SYNCED_NOTIFICATIONS); | 57 datatypes.push_back(syncer::SYNCED_NOTIFICATIONS); |
57 } | 58 } |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 | 157 |
157 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { | 158 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { |
158 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, | 159 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, |
159 syncer::AUTOFILL_PROFILE); | 160 syncer::AUTOFILL_PROFILE); |
160 } | 161 } |
161 | 162 |
162 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { | 163 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { |
163 TestSwitchDisablesType(switches::kDisableSyncPasswords, | 164 TestSwitchDisablesType(switches::kDisableSyncPasswords, |
164 syncer::PASSWORDS); | 165 syncer::PASSWORDS); |
165 } | 166 } |
OLD | NEW |