Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

Issue 131003007: Re-enable syncing shared settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 datatypes.push_back(syncer::PRIORITY_PREFERENCES); 52 datatypes.push_back(syncer::PRIORITY_PREFERENCES);
53 datatypes.push_back(syncer::SEARCH_ENGINES); 53 datatypes.push_back(syncer::SEARCH_ENGINES);
54 datatypes.push_back(syncer::SESSIONS); 54 datatypes.push_back(syncer::SESSIONS);
55 datatypes.push_back(syncer::PROXY_TABS); 55 datatypes.push_back(syncer::PROXY_TABS);
56 datatypes.push_back(syncer::THEMES); 56 datatypes.push_back(syncer::THEMES);
57 datatypes.push_back(syncer::TYPED_URLS); 57 datatypes.push_back(syncer::TYPED_URLS);
58 datatypes.push_back(syncer::FAVICON_TRACKING); 58 datatypes.push_back(syncer::FAVICON_TRACKING);
59 datatypes.push_back(syncer::FAVICON_IMAGES); 59 datatypes.push_back(syncer::FAVICON_IMAGES);
60 datatypes.push_back(syncer::SYNCED_NOTIFICATIONS); 60 datatypes.push_back(syncer::SYNCED_NOTIFICATIONS);
61 datatypes.push_back(syncer::MANAGED_USERS); 61 datatypes.push_back(syncer::MANAGED_USERS);
62 // TODO(bauerb): Enable once the Sync server has been updated to know about 62 datatypes.push_back(syncer::MANAGED_USER_SHARED_SETTINGS);
63 // this data type.
64 // datatypes.push_back(syncer::MANAGED_USER_SHARED_SETTINGS);
65 63
66 return datatypes; 64 return datatypes;
Nicolas Zea 2014/01/29 14:53:10 nit: fix indent
67 } 65 }
68 66
69 // Returns the number of default datatypes. 67 // Returns the number of default datatypes.
70 static size_t DefaultDatatypesCount() { 68 static size_t DefaultDatatypesCount() {
71 return DefaultDatatypes().size(); 69 return DefaultDatatypes().size();
72 } 70 }
73 71
74 // Asserts that all the default datatypes are in |map|, except 72 // Asserts that all the default datatypes are in |map|, except
75 // for |exception_type|, which unless it is UNDEFINED, is asserted to 73 // for |exception_type|, which unless it is UNDEFINED, is asserted to
76 // not be in |map|. 74 // not be in |map|.
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 159
162 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { 160 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) {
163 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, 161 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile,
164 syncer::AUTOFILL_PROFILE); 162 syncer::AUTOFILL_PROFILE);
165 } 163 }
166 164
167 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { 165 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) {
168 TestSwitchDisablesType(switches::kDisableSyncPasswords, 166 TestSwitchDisablesType(switches::kDisableSyncPasswords,
169 syncer::PASSWORDS); 167 syncer::PASSWORDS);
170 } 168 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698