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

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

Issue 2740363002: [Sync] Fix EnableDisableSingleClientTest (Closed)
Patch Set: fix unit_tests Created 3 years, 9 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
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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 "chrome/browser/sync/profile_sync_service_factory.h" 5 #include "chrome/browser/sync/profile_sync_service_factory.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #endif 44 #endif
45 datatypes.push_back(syncer::EXTENSIONS); 45 datatypes.push_back(syncer::EXTENSIONS);
46 datatypes.push_back(syncer::EXTENSION_SETTINGS); 46 datatypes.push_back(syncer::EXTENSION_SETTINGS);
47 datatypes.push_back(syncer::SEARCH_ENGINES); 47 datatypes.push_back(syncer::SEARCH_ENGINES);
48 datatypes.push_back(syncer::THEMES); 48 datatypes.push_back(syncer::THEMES);
49 datatypes.push_back(syncer::SUPERVISED_USERS); 49 datatypes.push_back(syncer::SUPERVISED_USERS);
50 datatypes.push_back(syncer::SUPERVISED_USER_SHARED_SETTINGS); 50 datatypes.push_back(syncer::SUPERVISED_USER_SHARED_SETTINGS);
51 #endif // !OS_ANDROID 51 #endif // !OS_ANDROID
52 52
53 #if defined(OS_CHROMEOS) 53 #if defined(OS_CHROMEOS)
54 datatypes.push_back(syncer::ARC_PACKAGE);
55 datatypes.push_back(syncer::PRINTERS); 54 datatypes.push_back(syncer::PRINTERS);
56 #endif // OS_CHROMEOS 55 #endif // OS_CHROMEOS
57 56
58 // Common types. 57 // Common types.
59 datatypes.push_back(syncer::AUTOFILL); 58 datatypes.push_back(syncer::AUTOFILL);
60 datatypes.push_back(syncer::AUTOFILL_PROFILE); 59 datatypes.push_back(syncer::AUTOFILL_PROFILE);
61 datatypes.push_back(syncer::AUTOFILL_WALLET_DATA); 60 datatypes.push_back(syncer::AUTOFILL_WALLET_DATA);
62 datatypes.push_back(syncer::AUTOFILL_WALLET_METADATA); 61 datatypes.push_back(syncer::AUTOFILL_WALLET_METADATA);
63 datatypes.push_back(syncer::BOOKMARKS); 62 datatypes.push_back(syncer::BOOKMARKS);
64 datatypes.push_back(syncer::DEVICE_INFO); 63 datatypes.push_back(syncer::DEVICE_INFO);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 syncer::ModelTypeSet disabled_types(syncer::AUTOFILL_PROFILE, 144 syncer::ModelTypeSet disabled_types(syncer::AUTOFILL_PROFILE,
146 syncer::BOOKMARKS); 145 syncer::BOOKMARKS);
147 SetDisabledTypes(disabled_types); 146 SetDisabledTypes(disabled_types);
148 ProfileSyncService* pss = ProfileSyncServiceFactory::GetForProfile(profile()); 147 ProfileSyncService* pss = ProfileSyncServiceFactory::GetForProfile(profile());
149 DataTypeController::StateMap controller_states; 148 DataTypeController::StateMap controller_states;
150 pss->GetDataTypeControllerStates(&controller_states); 149 pss->GetDataTypeControllerStates(&controller_states);
151 EXPECT_EQ(DefaultDatatypesCount() - disabled_types.Size(), 150 EXPECT_EQ(DefaultDatatypesCount() - disabled_types.Size(),
152 controller_states.size()); 151 controller_states.size());
153 CheckDefaultDatatypesInMapExcept(&controller_states, disabled_types); 152 CheckDefaultDatatypesInMapExcept(&controller_states, disabled_types);
154 } 153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698