| 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/file_path.h" | 8 #include "base/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 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 // Returns the collection of default datatypes. | 33 // Returns the collection of default datatypes. |
| 34 static std::vector<syncer::ModelType> DefaultDatatypes() { | 34 static std::vector<syncer::ModelType> DefaultDatatypes() { |
| 35 std::vector<syncer::ModelType> datatypes; | 35 std::vector<syncer::ModelType> datatypes; |
| 36 datatypes.push_back(syncer::APPS); | 36 datatypes.push_back(syncer::APPS); |
| 37 datatypes.push_back(syncer::APP_NOTIFICATIONS); | 37 datatypes.push_back(syncer::APP_NOTIFICATIONS); |
| 38 datatypes.push_back(syncer::APP_SETTINGS); | 38 datatypes.push_back(syncer::APP_SETTINGS); |
| 39 datatypes.push_back(syncer::AUTOFILL); | 39 datatypes.push_back(syncer::AUTOFILL); |
| 40 datatypes.push_back(syncer::AUTOFILL_PROFILE); | 40 datatypes.push_back(syncer::AUTOFILL_PROFILE); |
| 41 datatypes.push_back(syncer::BOOKMARKS); | 41 datatypes.push_back(syncer::BOOKMARKS); |
| 42 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) |
| 43 datatypes.push_back(syncer::DICTIONARY); |
| 44 #endif |
| 42 datatypes.push_back(syncer::EXTENSIONS); | 45 datatypes.push_back(syncer::EXTENSIONS); |
| 43 datatypes.push_back(syncer::EXTENSION_SETTINGS); | 46 datatypes.push_back(syncer::EXTENSION_SETTINGS); |
| 44 datatypes.push_back(syncer::PASSWORDS); | 47 datatypes.push_back(syncer::PASSWORDS); |
| 45 datatypes.push_back(syncer::PREFERENCES); | 48 datatypes.push_back(syncer::PREFERENCES); |
| 46 datatypes.push_back(syncer::SEARCH_ENGINES); | 49 datatypes.push_back(syncer::SEARCH_ENGINES); |
| 47 datatypes.push_back(syncer::SESSIONS); | 50 datatypes.push_back(syncer::SESSIONS); |
| 48 datatypes.push_back(syncer::THEMES); | 51 datatypes.push_back(syncer::THEMES); |
| 49 datatypes.push_back(syncer::TYPED_URLS); | 52 datatypes.push_back(syncer::TYPED_URLS); |
| 50 return datatypes; | 53 return datatypes; |
| 51 } | 54 } |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 | 148 |
| 146 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { | 149 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { |
| 147 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, | 150 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, |
| 148 syncer::AUTOFILL_PROFILE); | 151 syncer::AUTOFILL_PROFILE); |
| 149 } | 152 } |
| 150 | 153 |
| 151 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { | 154 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { |
| 152 TestSwitchDisablesType(switches::kDisableSyncPasswords, | 155 TestSwitchDisablesType(switches::kDisableSyncPasswords, |
| 153 syncer::PASSWORDS); | 156 syncer::PASSWORDS); |
| 154 } | 157 } |
| OLD | NEW |