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

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

Issue 2106663004: arc: Initial implemetation of Chrome sync for Arc packages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modify target Created 4 years, 4 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 <memory> 9 #include <memory>
10 10
(...skipping 22 matching lines...) Expand all
33 #if !defined(OS_ANDROID) 33 #if !defined(OS_ANDROID)
34 datatypes.push_back(syncer::APPS); 34 datatypes.push_back(syncer::APPS);
35 #if defined(ENABLE_APP_LIST) 35 #if defined(ENABLE_APP_LIST)
36 if (app_list::switches::IsAppListSyncEnabled()) 36 if (app_list::switches::IsAppListSyncEnabled())
37 datatypes.push_back(syncer::APP_LIST); 37 datatypes.push_back(syncer::APP_LIST);
38 #endif 38 #endif
39 datatypes.push_back(syncer::APP_SETTINGS); 39 datatypes.push_back(syncer::APP_SETTINGS);
40 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) 40 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
41 datatypes.push_back(syncer::DICTIONARY); 41 datatypes.push_back(syncer::DICTIONARY);
42 #endif 42 #endif
43 #if defined(OS_CHROMEOS)
44 datatypes.push_back(syncer::ARC_PACKAGE);
45 #endif
43 datatypes.push_back(syncer::EXTENSIONS); 46 datatypes.push_back(syncer::EXTENSIONS);
44 datatypes.push_back(syncer::EXTENSION_SETTINGS); 47 datatypes.push_back(syncer::EXTENSION_SETTINGS);
45 datatypes.push_back(syncer::PREFERENCES); 48 datatypes.push_back(syncer::PREFERENCES);
46 datatypes.push_back(syncer::SEARCH_ENGINES); 49 datatypes.push_back(syncer::SEARCH_ENGINES);
47 datatypes.push_back(syncer::THEMES); 50 datatypes.push_back(syncer::THEMES);
48 datatypes.push_back(syncer::SUPERVISED_USERS); 51 datatypes.push_back(syncer::SUPERVISED_USERS);
49 datatypes.push_back(syncer::SUPERVISED_USER_SHARED_SETTINGS); 52 datatypes.push_back(syncer::SUPERVISED_USER_SHARED_SETTINGS);
50 #endif // !OS_ANDROID 53 #endif // !OS_ANDROID
51 54
52 // Common types. 55 // Common types.
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 syncer::ModelTypeSet disabled_types(syncer::AUTOFILL_PROFILE, 141 syncer::ModelTypeSet disabled_types(syncer::AUTOFILL_PROFILE,
139 syncer::BOOKMARKS); 142 syncer::BOOKMARKS);
140 SetDisabledTypes(disabled_types); 143 SetDisabledTypes(disabled_types);
141 ProfileSyncService* pss = ProfileSyncServiceFactory::GetForProfile(profile()); 144 ProfileSyncService* pss = ProfileSyncServiceFactory::GetForProfile(profile());
142 DataTypeController::StateMap controller_states; 145 DataTypeController::StateMap controller_states;
143 pss->GetDataTypeControllerStates(&controller_states); 146 pss->GetDataTypeControllerStates(&controller_states);
144 EXPECT_EQ(DefaultDatatypesCount() - disabled_types.Size(), 147 EXPECT_EQ(DefaultDatatypesCount() - disabled_types.Size(),
145 controller_states.size()); 148 controller_states.size());
146 CheckDefaultDatatypesInMapExcept(&controller_states, disabled_types); 149 CheckDefaultDatatypesInMapExcept(&controller_states, disabled_types);
147 } 150 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/chrome_sync_client.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_list_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698