[Sync] Add CoreTypes support

sync/syncable/model_type.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/internal_api/public/base/model_type.h"
 
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
@@ skipping 349 matching lines @@
 }
 
 ModelTypeSet EncryptableUserTypes() {
   ModelTypeSet encryptable_user_types = UserTypes();
   // We never encrypt history delete directives.
   encryptable_user_types.Remove(HISTORY_DELETE_DIRECTIVES);
   // Synced notifications are not encrypted since the server must see changes.
   encryptable_user_types.Remove(SYNCED_NOTIFICATIONS);
   // Priority preferences are not encrypted because they might be synced before
   // encryption is ready.
-  encryptable_user_types.RemoveAll(PriorityUserTypes());
+  encryptable_user_types.Remove(PRIORITY_PREFERENCES);
   // Managed user settings are not encrypted since they are set server-side.
   encryptable_user_types.Remove(MANAGED_USER_SETTINGS);
   // Managed users are not encrypted since they are managed server-side.
   encryptable_user_types.Remove(MANAGED_USERS);
   // Proxy types have no sync representation and are therefore not encrypted.
   // Note however that proxy types map to one or more protocol types, which
   // may or may not be encrypted themselves.
   encryptable_user_types.RemoveAll(ProxyTypes());
   return encryptable_user_types;
 }
 
 ModelTypeSet PriorityUserTypes() {
-  return ModelTypeSet(PRIORITY_PREFERENCES, MANAGED_USERS);
+  return ModelTypeSet(PRIORITY_PREFERENCES);
 }
 
 ModelTypeSet ControlTypes() {
   ModelTypeSet set;
   // TODO(sync): We should be able to build the actual enumset's internal
   // bitset value here at compile time, rather than performing an iteration
   // every time.
   for (int i = FIRST_CONTROL_MODEL_TYPE; i <= LAST_CONTROL_MODEL_TYPE; ++i) {
     set.Put(ModelTypeFromInt(i));
   }
 
   return set;
 }
 
 ModelTypeSet ProxyTypes() {
   ModelTypeSet set;
   set.Put(PROXY_TABS);
   return set;
 }
 
 bool IsControlType(ModelType model_type) {
   return ControlTypes().Has(model_type);
 }
 
+ModelTypeSet PriorityCoreTypes() {
+  syncer::ModelTypeSet result;
+  result.Put(MANAGED_USERS);

[tim (not reviewing), 2013/07/16 16:54:55]

MANAGED_USER_SETTINGS fits the core type definition, but possibly not
priority...

[Nicolas Zea, 2013/07/17 21:05:37]

I don't think it's a core type either? We weren't configuring with it previously
at least.

+  return result;
+}
+
+ModelTypeSet CoreTypes() {

[tim (not reviewing), 2013/07/16 16:54:55]

Should this include PriorityCoreTypes?  What if I want 'all' CoreTypes (which we
do in DTM)?

[Nicolas Zea, 2013/07/17 21:05:37]

Yeah, I suppose CoreTypes() makes more sense as the union. Done.

+  syncer::ModelTypeSet result;
+  result.Put(SYNCED_NOTIFICATIONS);
+  return result;
+}
+
 const char* ModelTypeToString(ModelType model_type) {
   // This is used in serialization routines as well as for displaying debug
   // information.  Do not attempt to change these string values unless you know
   // what you're doing.
   switch (model_type) {
     case TOP_LEVEL_FOLDER:
       return "Top Level Folder";
     case UNSPECIFIED:
       return "Unspecified";
     case BOOKMARKS:
@@ skipping 504 matching lines @@
 
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
 
 bool IsActOnceDataType(ModelType model_type) {
   return model_type == HISTORY_DELETE_DIRECTIVES;
 }
 
 }  // namespace syncer