[sync] Add constexpr to EnumSet

components/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 "components/sync/base/model_type.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_split.h"
@@ skipping 411 matching lines @@
   if (specifics.has_experiments())
     return EXPERIMENTS;
 
   return UNSPECIFIED;
 }
 
 ModelTypeSet ProtocolTypes() {
   return Difference(ModelTypeSet::All(), ProxyTypes());
 }
 
-ModelTypeSet UserTypes() {
-  // TODO(sync): We should be able to build the actual enumset's internal
-  // bitset value here at compile time, instead of makes a new one each time.
-  return ModelTypeSet::FromRange(FIRST_USER_MODEL_TYPE, LAST_USER_MODEL_TYPE);
-}
-
-ModelTypeSet UserSelectableTypes() {
-  return ModelTypeSet(BOOKMARKS, PREFERENCES, PASSWORDS, AUTOFILL, THEMES,
-                      TYPED_URLS, EXTENSIONS, APPS,
-#if BUILDFLAG(ENABLE_READING_LIST)
-                      READING_LIST,
-#endif
-                      PROXY_TABS);
-}
-
-bool IsUserSelectableType(ModelType model_type) {
-  return UserSelectableTypes().Has(model_type);
-}
-
 ModelTypeNameMap GetUserSelectableTypeNameMap() {
   ModelTypeNameMap type_names;
   ModelTypeSet type_set = UserSelectableTypes();
   ModelTypeSet::Iterator it = type_set.First();
   DCHECK_EQ(arraysize(kUserSelectableDataTypeNames), type_set.Size());
   for (size_t i = 0; i < arraysize(kUserSelectableDataTypeNames) && it.Good();
        ++i, it.Inc()) {
     type_names[it.Get()] = kUserSelectableDataTypeNames[i];
   }
   return type_names;
@@ skipping 31 matching lines @@
   encryptable_user_types.Remove(SUPERVISED_USER_WHITELISTS);
   // User events are not encrypted since they are consumed server-side.
   encryptable_user_types.Remove(USER_EVENTS);
   // 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(DEVICE_INFO, PRIORITY_PREFERENCES);
-}
-
-ModelTypeSet ControlTypes() {
-  // TODO(sync): We should be able to build the actual enumset's internal
-  // bitset value here at compile time, instead of makes a new one each time.
-  return ModelTypeSet::FromRange(FIRST_CONTROL_MODEL_TYPE,
-                                 LAST_CONTROL_MODEL_TYPE);
-}
-
-ModelTypeSet ProxyTypes() {
-  return ModelTypeSet::FromRange(FIRST_PROXY_TYPE, LAST_PROXY_TYPE);
-}
-
-bool IsControlType(ModelType model_type) {
-  return ControlTypes().Has(model_type);
-}
-
 ModelTypeSet CoreTypes() {
   ModelTypeSet result = PriorityCoreTypes();
 
   // The following are low priority core types.
-  result.Put(SYNCED_NOTIFICATIONS);
-  result.Put(SYNCED_NOTIFICATION_APP_INFO);
-  result.Put(SUPERVISED_USER_SHARED_SETTINGS);
-  result.Put(SUPERVISED_USER_WHITELISTS);
+  result.PutAll(ModelTypeSet(SYNCED_NOTIFICATIONS, SYNCED_NOTIFICATION_APP_INFO,
+                             SUPERVISED_USER_SHARED_SETTINGS,
+                             SUPERVISED_USER_WHITELISTS));
 
   return result;
 }
 
 ModelTypeSet PriorityCoreTypes() {
   ModelTypeSet result = ControlTypes();
 
   // The following are non-control core types.
-  result.Put(SUPERVISED_USERS);
-  result.Put(SUPERVISED_USER_SETTINGS);
+  result.PutAll(ModelTypeSet(SUPERVISED_USERS, SUPERVISED_USER_SETTINGS));
 
   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.
   if (model_type >= UNSPECIFIED && model_type < MODEL_TYPE_COUNT)
     return kModelTypeInfoMap[model_type].model_type_string;
@@ skipping 176 matching lines @@
 bool TypeSupportsHierarchy(ModelType model_type) {
   // TODO(stanisc): crbug/438313: Should this also include TOP_LEVEL_FOLDER?
   return model_type == BOOKMARKS;
 }
 
 bool TypeSupportsOrdering(ModelType model_type) {
   return model_type == BOOKMARKS;
 }
 
 }  // namespace syncer