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 27 matching lines...) Expand all Loading... |
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 datatypes.push_back(syncer::EXTENSIONS); | 42 datatypes.push_back(syncer::EXTENSIONS); |
43 datatypes.push_back(syncer::EXTENSION_SETTINGS); | 43 datatypes.push_back(syncer::EXTENSION_SETTINGS); |
44 datatypes.push_back(syncer::PASSWORDS); | 44 datatypes.push_back(syncer::PASSWORDS); |
45 datatypes.push_back(syncer::PREFERENCES); | 45 datatypes.push_back(syncer::PREFERENCES); |
46 datatypes.push_back(syncer::SEARCH_ENGINES); | 46 datatypes.push_back(syncer::SEARCH_ENGINES); |
47 datatypes.push_back(syncer::SESSIONS); | 47 datatypes.push_back(syncer::SESSIONS); |
| 48 datatypes.push_back(syncer::TABS); |
48 datatypes.push_back(syncer::THEMES); | 49 datatypes.push_back(syncer::THEMES); |
49 datatypes.push_back(syncer::TYPED_URLS); | 50 datatypes.push_back(syncer::TYPED_URLS); |
50 return datatypes; | 51 return datatypes; |
51 } | 52 } |
52 | 53 |
53 // Returns the number of default datatypes. | 54 // Returns the number of default datatypes. |
54 static size_t DefaultDatatypesCount() { | 55 static size_t DefaultDatatypesCount() { |
55 return DefaultDatatypes().size(); | 56 return DefaultDatatypes().size(); |
56 } | 57 } |
57 | 58 |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 146 |
146 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { | 147 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { |
147 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, | 148 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, |
148 syncer::AUTOFILL_PROFILE); | 149 syncer::AUTOFILL_PROFILE); |
149 } | 150 } |
150 | 151 |
151 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { | 152 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { |
152 TestSwitchDisablesType(switches::kDisableSyncPasswords, | 153 TestSwitchDisablesType(switches::kDisableSyncPasswords, |
153 syncer::PASSWORDS); | 154 syncer::PASSWORDS); |
154 } | 155 } |
OLD | NEW |