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 25 matching lines...) Expand all Loading... |
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::AUTOFILL_PROFILE); | 44 datatypes.push_back(syncable::AUTOFILL_PROFILE); |
45 datatypes.push_back(syncable::PASSWORDS); | 45 datatypes.push_back(syncable::PASSWORDS); |
| 46 datatypes.push_back(syncable::TYPED_URLS); |
46 return datatypes; | 47 return datatypes; |
47 } | 48 } |
48 | 49 |
49 // Returns the number of default datatypes. | 50 // Returns the number of default datatypes. |
50 static size_t DefaultDatatypesCount() { | 51 static size_t DefaultDatatypesCount() { |
51 return DefaultDatatypes().size(); | 52 return DefaultDatatypes().size(); |
52 } | 53 } |
53 | 54 |
54 // Asserts that all the default datatypes are in |map|, except | 55 // Asserts that all the default datatypes are in |map|, except |
55 // for |exception_type|, which unless it is UNDEFINED, is asserted to | 56 // for |exception_type|, which unless it is UNDEFINED, is asserted to |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 | 133 |
133 TEST_F(ProfileSyncFactoryImplTest, CreatePSSDisableAutofillProfile) { | 134 TEST_F(ProfileSyncFactoryImplTest, CreatePSSDisableAutofillProfile) { |
134 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, | 135 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, |
135 syncable::AUTOFILL_PROFILE); | 136 syncable::AUTOFILL_PROFILE); |
136 } | 137 } |
137 | 138 |
138 TEST_F(ProfileSyncFactoryImplTest, CreatePSSDisablePasswords) { | 139 TEST_F(ProfileSyncFactoryImplTest, CreatePSSDisablePasswords) { |
139 TestSwitchDisablesType(switches::kDisableSyncPasswords, | 140 TestSwitchDisablesType(switches::kDisableSyncPasswords, |
140 syncable::PASSWORDS); | 141 syncable::PASSWORDS); |
141 } | 142 } |
OLD | NEW |