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