| 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 29 matching lines...) Expand all  Loading... | 
| 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::PASSWORDS); | 48     datatypes.push_back(syncer::PASSWORDS); | 
| 49     datatypes.push_back(syncer::PREFERENCES); | 49     datatypes.push_back(syncer::PREFERENCES); | 
|  | 50     datatypes.push_back(syncer::PRIORITY_PREFERENCES); | 
| 50     datatypes.push_back(syncer::SEARCH_ENGINES); | 51     datatypes.push_back(syncer::SEARCH_ENGINES); | 
| 51     datatypes.push_back(syncer::SESSIONS); | 52     datatypes.push_back(syncer::SESSIONS); | 
| 52     if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN || | 53     if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN || | 
| 53         channel == chrome::VersionInfo::CHANNEL_DEV || | 54         channel == chrome::VersionInfo::CHANNEL_DEV || | 
| 54         channel == chrome::VersionInfo::CHANNEL_CANARY) { | 55         channel == chrome::VersionInfo::CHANNEL_CANARY) { | 
| 55       datatypes.push_back(syncer::SYNCED_NOTIFICATIONS); | 56       datatypes.push_back(syncer::SYNCED_NOTIFICATIONS); | 
| 56     } | 57     } | 
| 57     datatypes.push_back(syncer::PROXY_TABS); | 58     datatypes.push_back(syncer::PROXY_TABS); | 
| 58     datatypes.push_back(syncer::THEMES); | 59     datatypes.push_back(syncer::THEMES); | 
| 59     datatypes.push_back(syncer::TYPED_URLS); | 60     datatypes.push_back(syncer::TYPED_URLS); | 
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 155 | 156 | 
| 156 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { | 157 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { | 
| 157   TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, | 158   TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, | 
| 158                          syncer::AUTOFILL_PROFILE); | 159                          syncer::AUTOFILL_PROFILE); | 
| 159 } | 160 } | 
| 160 | 161 | 
| 161 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { | 162 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { | 
| 162   TestSwitchDisablesType(switches::kDisableSyncPasswords, | 163   TestSwitchDisablesType(switches::kDisableSyncPasswords, | 
| 163                          syncer::PASSWORDS); | 164                          syncer::PASSWORDS); | 
| 164 } | 165 } | 
| OLD | NEW | 
|---|