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 30 matching lines...) Expand all Loading... |
41 datatypes.push_back(syncer::BOOKMARKS); | 41 datatypes.push_back(syncer::BOOKMARKS); |
42 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) | 42 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) |
43 datatypes.push_back(syncer::DICTIONARY); | 43 datatypes.push_back(syncer::DICTIONARY); |
44 #endif | 44 #endif |
45 datatypes.push_back(syncer::EXTENSIONS); | 45 datatypes.push_back(syncer::EXTENSIONS); |
46 datatypes.push_back(syncer::EXTENSION_SETTINGS); | 46 datatypes.push_back(syncer::EXTENSION_SETTINGS); |
47 datatypes.push_back(syncer::PASSWORDS); | 47 datatypes.push_back(syncer::PASSWORDS); |
48 datatypes.push_back(syncer::PREFERENCES); | 48 datatypes.push_back(syncer::PREFERENCES); |
49 datatypes.push_back(syncer::SEARCH_ENGINES); | 49 datatypes.push_back(syncer::SEARCH_ENGINES); |
50 datatypes.push_back(syncer::SESSIONS); | 50 datatypes.push_back(syncer::SESSIONS); |
| 51 datatypes.push_back(syncer::PROXY_TABS); |
51 datatypes.push_back(syncer::THEMES); | 52 datatypes.push_back(syncer::THEMES); |
52 datatypes.push_back(syncer::TYPED_URLS); | 53 datatypes.push_back(syncer::TYPED_URLS); |
53 return datatypes; | 54 return datatypes; |
54 } | 55 } |
55 | 56 |
56 // Returns the number of default datatypes. | 57 // Returns the number of default datatypes. |
57 static size_t DefaultDatatypesCount() { | 58 static size_t DefaultDatatypesCount() { |
58 return DefaultDatatypes().size(); | 59 return DefaultDatatypes().size(); |
59 } | 60 } |
60 | 61 |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 | 149 |
149 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { | 150 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { |
150 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, | 151 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, |
151 syncer::AUTOFILL_PROFILE); | 152 syncer::AUTOFILL_PROFILE); |
152 } | 153 } |
153 | 154 |
154 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { | 155 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { |
155 TestSwitchDisablesType(switches::kDisableSyncPasswords, | 156 TestSwitchDisablesType(switches::kDisableSyncPasswords, |
156 syncer::PASSWORDS); | 157 syncer::PASSWORDS); |
157 } | 158 } |
OLD | NEW |