OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 23 matching lines...) Expand all Loading... |
34 | 34 |
35 // Returns the collection of default datatypes. | 35 // Returns the collection of default datatypes. |
36 static std::vector<syncable::ModelType> DefaultDatatypes() { | 36 static std::vector<syncable::ModelType> DefaultDatatypes() { |
37 std::vector<syncable::ModelType> datatypes; | 37 std::vector<syncable::ModelType> datatypes; |
38 datatypes.push_back(syncable::BOOKMARKS); | 38 datatypes.push_back(syncable::BOOKMARKS); |
39 datatypes.push_back(syncable::PREFERENCES); | 39 datatypes.push_back(syncable::PREFERENCES); |
40 datatypes.push_back(syncable::AUTOFILL); | 40 datatypes.push_back(syncable::AUTOFILL); |
41 datatypes.push_back(syncable::THEMES); | 41 datatypes.push_back(syncable::THEMES); |
42 datatypes.push_back(syncable::EXTENSIONS); | 42 datatypes.push_back(syncable::EXTENSIONS); |
43 datatypes.push_back(syncable::APPS); | 43 datatypes.push_back(syncable::APPS); |
| 44 datatypes.push_back(syncable::APP_NOTIFICATIONS); |
44 datatypes.push_back(syncable::AUTOFILL_PROFILE); | 45 datatypes.push_back(syncable::AUTOFILL_PROFILE); |
45 datatypes.push_back(syncable::PASSWORDS); | 46 datatypes.push_back(syncable::PASSWORDS); |
46 datatypes.push_back(syncable::TYPED_URLS); | 47 datatypes.push_back(syncable::TYPED_URLS); |
47 datatypes.push_back(syncable::SEARCH_ENGINES); | 48 datatypes.push_back(syncable::SEARCH_ENGINES); |
48 return datatypes; | 49 return datatypes; |
49 } | 50 } |
50 | 51 |
51 // Returns the number of default datatypes. | 52 // Returns the number of default datatypes. |
52 static size_t DefaultDatatypesCount() { | 53 static size_t DefaultDatatypesCount() { |
53 return DefaultDatatypes().size(); | 54 return DefaultDatatypes().size(); |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 | 135 |
135 TEST_F(ProfileSyncFactoryImplTest, CreatePSSDisableAutofillProfile) { | 136 TEST_F(ProfileSyncFactoryImplTest, CreatePSSDisableAutofillProfile) { |
136 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, | 137 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, |
137 syncable::AUTOFILL_PROFILE); | 138 syncable::AUTOFILL_PROFILE); |
138 } | 139 } |
139 | 140 |
140 TEST_F(ProfileSyncFactoryImplTest, CreatePSSDisablePasswords) { | 141 TEST_F(ProfileSyncFactoryImplTest, CreatePSSDisablePasswords) { |
141 TestSwitchDisablesType(switches::kDisableSyncPasswords, | 142 TestSwitchDisablesType(switches::kDisableSyncPasswords, |
142 syncable::PASSWORDS); | 143 syncable::PASSWORDS); |
143 } | 144 } |
OLD | NEW |