Rename "managed (mode|user)" to "supervised user" (part 1)

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 89 matching lines @@
       break;
     case DICTIONARY:
       specifics->mutable_dictionary();
       break;
     case FAVICON_IMAGES:
       specifics->mutable_favicon_image();
       break;
     case FAVICON_TRACKING:
       specifics->mutable_favicon_tracking();
       break;
-    case MANAGED_USER_SETTINGS:
+    case SUPERVISED_USER_SETTINGS:
       specifics->mutable_managed_user_setting();
       break;
-    case MANAGED_USERS:
+    case SUPERVISED_USERS:
       specifics->mutable_managed_user();
       break;
-    case MANAGED_USER_SHARED_SETTINGS:
+    case SUPERVISED_USER_SHARED_SETTINGS:
       specifics->mutable_managed_user_shared_setting();
       break;
     case ARTICLES:
       specifics->mutable_article();
       break;
     default:
       NOTREACHED() << "No known extension for model type.";
   }
 }
 
@@ skipping 54 matching lines @@
     case EXPERIMENTS:
       return sync_pb::EntitySpecifics::kExperimentsFieldNumber;
     case PRIORITY_PREFERENCES:
       return sync_pb::EntitySpecifics::kPriorityPreferenceFieldNumber;
     case DICTIONARY:
       return sync_pb::EntitySpecifics::kDictionaryFieldNumber;
     case FAVICON_IMAGES:
       return sync_pb::EntitySpecifics::kFaviconImageFieldNumber;
     case FAVICON_TRACKING:
       return sync_pb::EntitySpecifics::kFaviconTrackingFieldNumber;
-    case MANAGED_USER_SETTINGS:
+    case SUPERVISED_USER_SETTINGS:
       return sync_pb::EntitySpecifics::kManagedUserSettingFieldNumber;
-    case MANAGED_USERS:
+    case SUPERVISED_USERS:
       return sync_pb::EntitySpecifics::kManagedUserFieldNumber;
-    case MANAGED_USER_SHARED_SETTINGS:
+    case SUPERVISED_USER_SHARED_SETTINGS:
       return sync_pb::EntitySpecifics::kManagedUserSharedSettingFieldNumber;
     case ARTICLES:
       return sync_pb::EntitySpecifics::kArticleFieldNumber;
     default:
       NOTREACHED() << "No known extension for model type.";
       return 0;
   }
 }
 
 FullModelTypeSet ToFullModelTypeSet(ModelTypeSet in) {
@@ skipping 100 matching lines @@
   if (specifics.has_dictionary())
     return DICTIONARY;
 
   if (specifics.has_favicon_image())
     return FAVICON_IMAGES;
 
   if (specifics.has_favicon_tracking())
     return FAVICON_TRACKING;
 
   if (specifics.has_managed_user_setting())
-    return MANAGED_USER_SETTINGS;
+    return SUPERVISED_USER_SETTINGS;
 
   if (specifics.has_managed_user())
-    return MANAGED_USERS;
+    return SUPERVISED_USERS;
 
   if (specifics.has_managed_user_shared_setting())
-    return MANAGED_USER_SHARED_SETTINGS;
+    return SUPERVISED_USER_SHARED_SETTINGS;
 
   if (specifics.has_article())
     return ARTICLES;
 
   return UNSPECIFIED;
 }
 
 ModelTypeSet ProtocolTypes() {
   ModelTypeSet set = ModelTypeSet::All();
   set.RemoveAll(ProxyTypes());
@@ skipping 36 matching lines @@
   // 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);
   // Synced Notification App Info does not have private data, so it is not
   // encrypted.
   encryptable_user_types.Remove(SYNCED_NOTIFICATION_APP_INFO);
   // Priority preferences are not encrypted because they might be synced before
   // encryption is ready.
   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);
-  // Managed user shared settings are not encrypted since they are managed
+  // Supervised user settings are not encrypted since they are set server-side.
+  encryptable_user_types.Remove(SUPERVISED_USER_SETTINGS);
+  // Supervised users are not encrypted since they are managed server-side.
+  encryptable_user_types.Remove(SUPERVISED_USERS);
+  // Supervised user shared settings are not encrypted since they are managed
   // server-side and shared between manager and supervised user.
-  encryptable_user_types.Remove(MANAGED_USER_SHARED_SETTINGS);
+  encryptable_user_types.Remove(SUPERVISED_USER_SHARED_SETTINGS);
   // 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);
 }
@@ skipping 20 matching lines @@
   return ControlTypes().Has(model_type);
 }
 
 ModelTypeSet CoreTypes() {
   syncer::ModelTypeSet result;
   result.PutAll(PriorityCoreTypes());
 
   // The following are low priority core types.
   result.Put(SYNCED_NOTIFICATIONS);
   result.Put(SYNCED_NOTIFICATION_APP_INFO);
-  result.Put(MANAGED_USER_SHARED_SETTINGS);
+  result.Put(SUPERVISED_USER_SHARED_SETTINGS);
 
   return result;
 }
 
 ModelTypeSet PriorityCoreTypes() {
   syncer::ModelTypeSet result;
   result.PutAll(ControlTypes());
 
   // The following are non-control core types.
-  result.Put(MANAGED_USERS);
+  result.Put(SUPERVISED_USERS);
 
   return result;
 }
 
 ModelTypeSet BackupTypes() {
   ModelTypeSet result;
   result.Put(BOOKMARKS);
   result.Put(PREFERENCES);
   result.Put(THEMES);
   result.Put(EXTENSIONS);
@@ skipping 58 matching lines @@
     case EXPERIMENTS:
       return "Experiments";
     case PRIORITY_PREFERENCES:
       return "Priority Preferences";
     case DICTIONARY:
       return "Dictionary";
     case FAVICON_IMAGES:
       return "Favicon Images";
     case FAVICON_TRACKING:
       return "Favicon Tracking";
-    case MANAGED_USER_SETTINGS:
+    case SUPERVISED_USER_SETTINGS:
       return "Managed User Settings";
-    case MANAGED_USERS:
+    case SUPERVISED_USERS:
       return "Managed Users";
-    case MANAGED_USER_SHARED_SETTINGS:
+    case SUPERVISED_USER_SHARED_SETTINGS:
       return "Managed User Shared Settings";
     case ARTICLES:
       return "Articles";
     case PROXY_TABS:
       return "Tabs";
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
@@ skipping 50 matching lines @@
     case PRIORITY_PREFERENCES:
       return 21;
     case DICTIONARY:
       return 22;
     case FAVICON_IMAGES:
       return 23;
     case FAVICON_TRACKING:
       return 24;
     case PROXY_TABS:
       return 25;
-    case MANAGED_USER_SETTINGS:
+    case SUPERVISED_USER_SETTINGS:
       return 26;
-    case MANAGED_USERS:
+    case SUPERVISED_USERS:
       return 27;
     case ARTICLES:
       return 28;
     case APP_LIST:
       return 29;
-    case MANAGED_USER_SHARED_SETTINGS:
+    case SUPERVISED_USER_SHARED_SETTINGS:
       return 30;
     case SYNCED_NOTIFICATION_APP_INFO:
       return 31;
     // Silence a compiler warning.
     case MODEL_TYPE_COUNT:
       return 0;
   }
   return 0;
 }
 
@@ skipping 69 matching lines @@
     return EXPERIMENTS;
   else if (model_type_string == "Priority Preferences")
     return PRIORITY_PREFERENCES;
   else if (model_type_string == "Dictionary")
     return DICTIONARY;
   else if (model_type_string == "Favicon Images")
     return FAVICON_IMAGES;
   else if (model_type_string == "Favicon Tracking")
     return FAVICON_TRACKING;
   else if (model_type_string == "Managed User Settings")
-    return MANAGED_USER_SETTINGS;
+    return SUPERVISED_USER_SETTINGS;
   else if (model_type_string == "Managed Users")
-    return MANAGED_USERS;
+    return SUPERVISED_USERS;
   else if (model_type_string == "Managed User Shared Settings")
-    return MANAGED_USER_SHARED_SETTINGS;
+    return SUPERVISED_USER_SHARED_SETTINGS;
   else if (model_type_string == "Articles")
     return ARTICLES;
   else if (model_type_string == "Tabs")
     return PROXY_TABS;
   else
     NOTREACHED() << "No known model type corresponding to "
                  << model_type_string << ".";
   return UNSPECIFIED;
 }
 
@@ skipping 98 matching lines @@
     case EXPERIMENTS:
       return "google_chrome_experiments";
     case PRIORITY_PREFERENCES:
       return "google_chrome_priority_preferences";
     case DICTIONARY:
       return "google_chrome_dictionary";
     case FAVICON_IMAGES:
       return "google_chrome_favicon_images";
     case FAVICON_TRACKING:
       return "google_chrome_favicon_tracking";
-    case MANAGED_USER_SETTINGS:
+    case SUPERVISED_USER_SETTINGS:
       return "google_chrome_managed_user_settings";
-    case MANAGED_USERS:
+    case SUPERVISED_USERS:
       return "google_chrome_managed_users";
-    case MANAGED_USER_SHARED_SETTINGS:
+    case SUPERVISED_USER_SHARED_SETTINGS:
       return "google_chrome_managed_user_shared_settings";
     case ARTICLES:
       return "google_chrome_articles";
     case PROXY_TABS:
       return std::string();
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
@@ skipping 22 matching lines @@
 const char kHistoryDeleteDirectiveNotificationType[] =
     "HISTORY_DELETE_DIRECTIVE";
 const char kSyncedNotificationType[] = "SYNCED_NOTIFICATION";
 const char kSyncedNotificationAppInfoType[] = "SYNCED_NOTIFICATION_APP_INFO";
 const char kDeviceInfoNotificationType[] = "DEVICE_INFO";
 const char kExperimentsNotificationType[] = "EXPERIMENTS";
 const char kPriorityPreferenceNotificationType[] = "PRIORITY_PREFERENCE";
 const char kDictionaryNotificationType[] = "DICTIONARY";
 const char kFaviconImageNotificationType[] = "FAVICON_IMAGE";
 const char kFaviconTrackingNotificationType[] = "FAVICON_TRACKING";
-const char kManagedUserSettingNotificationType[] = "MANAGED_USER_SETTING";
-const char kManagedUserNotificationType[] = "MANAGED_USER";
-const char kManagedUserSharedSettingNotificationType[] =
+const char kSupervisedUserSettingNotificationType[] = "MANAGED_USER_SETTING";
+const char kSupervisedUserNotificationType[] = "MANAGED_USER";
+const char kSupervisedUserSharedSettingNotificationType[] =
     "MANAGED_USER_SHARED_SETTING";
 const char kArticleNotificationType[] = "ARTICLE";
 }  // namespace
 
 bool RealModelTypeToNotificationType(ModelType model_type,
                                      std::string* notification_type) {
   switch (model_type) {
     case BOOKMARKS:
       *notification_type = kBookmarkNotificationType;
       return true;
@@ skipping 62 matching lines @@
       return true;
     case DICTIONARY:
       *notification_type = kDictionaryNotificationType;
       return true;
     case FAVICON_IMAGES:
       *notification_type = kFaviconImageNotificationType;
       return true;
     case FAVICON_TRACKING:
       *notification_type = kFaviconTrackingNotificationType;
       return true;
-    case MANAGED_USER_SETTINGS:
-      *notification_type = kManagedUserSettingNotificationType;
+    case SUPERVISED_USER_SETTINGS:
+      *notification_type = kSupervisedUserSettingNotificationType;
       return true;
-    case MANAGED_USERS:
-      *notification_type = kManagedUserNotificationType;
+    case SUPERVISED_USERS:
+      *notification_type = kSupervisedUserNotificationType;
       return true;
-    case MANAGED_USER_SHARED_SETTINGS:
-      *notification_type = kManagedUserSharedSettingNotificationType;
+    case SUPERVISED_USER_SHARED_SETTINGS:
+      *notification_type = kSupervisedUserSharedSettingNotificationType;
       return true;
     case ARTICLES:
       *notification_type = kArticleNotificationType;
       return true;
     default:
       break;
   }
   notification_type->clear();
   return false;
 }
@@ skipping 68 matching lines @@
     return true;
   } else if (notification_type == kDictionaryNotificationType) {
     *model_type = DICTIONARY;
     return true;
   } else if (notification_type == kFaviconImageNotificationType) {
     *model_type = FAVICON_IMAGES;
     return true;
   } else if (notification_type == kFaviconTrackingNotificationType) {
     *model_type = FAVICON_TRACKING;
     return true;
-  } else if (notification_type == kManagedUserSettingNotificationType) {
-    *model_type = MANAGED_USER_SETTINGS;
+  } else if (notification_type == kSupervisedUserSettingNotificationType) {
+    *model_type = SUPERVISED_USER_SETTINGS;
     return true;
-  } else if (notification_type == kManagedUserNotificationType) {
-    *model_type = MANAGED_USERS;
+  } else if (notification_type == kSupervisedUserNotificationType) {
+    *model_type = SUPERVISED_USERS;
     return true;
-  } else if (notification_type == kManagedUserSharedSettingNotificationType) {
-    *model_type = MANAGED_USER_SHARED_SETTINGS;
+  } else if (notification_type ==
+      kSupervisedUserSharedSettingNotificationType) {
+    *model_type = SUPERVISED_USER_SHARED_SETTINGS;
     return true;
   } else if (notification_type == kArticleNotificationType) {
     *model_type = ARTICLES;
     return true;
   }
   *model_type = UNSPECIFIED;
   return false;
 }
 
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
 
 bool IsProxyType(ModelType model_type) {
   return model_type >= FIRST_PROXY_TYPE && model_type <= LAST_PROXY_TYPE;
 }
 
 bool IsActOnceDataType(ModelType model_type) {
   return model_type == HISTORY_DELETE_DIRECTIVES;
 }
 
 }  // namespace syncer