Sync: Delete deprecated SUPERVISED_USERS and _SHARED_SETTINGS data types

These two types are deprecated and can be removed. Note that
SUPERVISER_USER_SETTINGS and SUPERVISED_USER_WHITELISTS are *not*
deprecated.

This includes removing the ModelType enum entries, removing the fields
in the EntitySpecifics proto, and deleting the specifics proto files.

Bug: 965503
Change-Id: I53038fdc28ed8518cd99d4a4769b5f1f52d3e94b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824882
Commit-Queue: Marc Treib <treib@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700687}

chrome/browser/sync/profile_sync_service_factory_unittest.cc

@@ -45,7 +45,7 @@ class ProfileSyncServiceFactoryTest : public testing::Test {
 
   // Returns the collection of default datatypes.
   std::vector<syncer::ModelType> DefaultDatatypes() {
-    static_assert(43 == syncer::ModelType::NUM_ENTRIES,
+    static_assert(41 == syncer::ModelType::NUM_ENTRIES,
                   "When adding a new type, you probably want to add it here as "
                   "well (assuming it is already enabled).");
 

components/sync/base/data_type_histogram.h

@@ -110,12 +110,6 @@ void SyncRecordModelTypeCountHistogram(syncer::ModelType model_type,
       case ::syncer::SUPERVISED_USER_SETTINGS:                   \
         PER_DATA_TYPE_MACRO("ManagedUserSetting");               \
         break;                                                   \
-      case ::syncer::DEPRECATED_SUPERVISED_USERS:                \
-        PER_DATA_TYPE_MACRO("ManagedUser");                      \
-        break;                                                   \
-      case ::syncer::DEPRECATED_SUPERVISED_USER_SHARED_SETTINGS: \
-        PER_DATA_TYPE_MACRO("ManagedUserSharedSetting");         \
-        break;                                                   \
       case ::syncer::DEPRECATED_ARTICLES:                        \
         PER_DATA_TYPE_MACRO("Article");                          \
         break;                                                   \

components/sync/base/model_type.cc

@@ -130,13 +130,6 @@ const ModelTypeInfo kModelTypeInfoMap[] = {
      "Managed User Settings",
      sync_pb::EntitySpecifics::kManagedUserSettingFieldNumber,
      ModelTypeForHistograms::kSupervisedUserSettings},
-    {DEPRECATED_SUPERVISED_USERS, "MANAGED_USER", "managed_users",
-     "Managed Users", sync_pb::EntitySpecifics::kManagedUserFieldNumber,
-     ModelTypeForHistograms::kDeprecatedSupervisedUsers},
-    {DEPRECATED_SUPERVISED_USER_SHARED_SETTINGS, "MANAGED_USER_SHARED_SETTING",
-     "managed_user_shared_settings", "Managed User Shared Settings",
-     sync_pb::EntitySpecifics::kManagedUserSharedSettingFieldNumber,
-     ModelTypeForHistograms::kDeprecatedSupervisedUserSharedSettings},
     {DEPRECATED_ARTICLES, "ARTICLE", "articles", "Articles",
      sync_pb::EntitySpecifics::kArticleFieldNumber,
      ModelTypeForHistograms::kDeprecatedArticles},
@@ -195,11 +188,11 @@ const ModelTypeInfo kModelTypeInfoMap[] = {
 static_assert(base::size(kModelTypeInfoMap) == ModelType::NUM_ENTRIES,
               "kModelTypeInfoMap should have ModelType::NUM_ENTRIES elements");
 
-static_assert(43 == syncer::ModelType::NUM_ENTRIES,
+static_assert(41 == syncer::ModelType::NUM_ENTRIES,
               "When adding a new type, update enum SyncModelTypes in enums.xml "
               "and suffix SyncModelType in histograms.xml.");
 
-static_assert(43 == syncer::ModelType::NUM_ENTRIES,
+static_assert(41 == syncer::ModelType::NUM_ENTRIES,
               "When adding a new type, update kAllocatorDumpNameWhitelist in "
               "base/trace_event/memory_infra_background_whitelist.cc.");
 
@@ -275,12 +268,6 @@ void AddDefaultFieldValue(ModelType type, sync_pb::EntitySpecifics* specifics) {
     case SUPERVISED_USER_SETTINGS:
       specifics->mutable_managed_user_setting();
       break;
-    case DEPRECATED_SUPERVISED_USERS:
-      specifics->mutable_managed_user();
-      break;
-    case DEPRECATED_SUPERVISED_USER_SHARED_SETTINGS:
-      specifics->mutable_managed_user_shared_setting();
-      break;
     case DEPRECATED_ARTICLES:
       specifics->mutable_article();
       break;
@@ -374,7 +361,7 @@ ModelType GetModelType(const sync_pb::SyncEntity& sync_entity) {
 }
 
 ModelType GetModelTypeFromSpecifics(const sync_pb::EntitySpecifics& specifics) {
-  static_assert(43 == ModelType::NUM_ENTRIES,
+  static_assert(41 == ModelType::NUM_ENTRIES,
                 "When adding new protocol types, the following type lookup "
                 "logic must be updated.");
   if (specifics.has_bookmark())
@@ -421,10 +408,6 @@ ModelType GetModelTypeFromSpecifics(const sync_pb::EntitySpecifics& specifics) {
     return PRIORITY_PREFERENCES;
   if (specifics.has_managed_user_setting())
     return SUPERVISED_USER_SETTINGS;
-  if (specifics.has_managed_user())
-    return DEPRECATED_SUPERVISED_USERS;
-  if (specifics.has_managed_user_shared_setting())
-    return DEPRECATED_SUPERVISED_USER_SHARED_SETTINGS;
   if (specifics.has_article())
     return DEPRECATED_ARTICLES;
   if (specifics.has_app_list())
@@ -462,7 +445,7 @@ ModelType GetModelTypeFromSpecifics(const sync_pb::EntitySpecifics& specifics) {
 }
 
 ModelTypeSet EncryptableUserTypes() {
-  static_assert(43 == ModelType::NUM_ENTRIES,
+  static_assert(41 == ModelType::NUM_ENTRIES,
                 "If adding an unencryptable type, remove from "
                 "encryptable_user_types below.");
   ModelTypeSet encryptable_user_types = UserTypes();
@@ -478,11 +461,6 @@ ModelTypeSet EncryptableUserTypes() {
   encryptable_user_types.Remove(PRIORITY_PREFERENCES);
   // 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(DEPRECATED_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(DEPRECATED_SUPERVISED_USER_SHARED_SETTINGS);
   // Supervised user whitelists are not encrypted since they are managed
   // server-side.
   encryptable_user_types.Remove(SUPERVISED_USER_WHITELISTS);

components/sync/base/model_type.h

@@ -110,8 +110,6 @@ enum ModelType {
   PRIORITY_PREFERENCES,
   // Supervised user settings. Cannot be encrypted.
   SUPERVISED_USER_SETTINGS,
-  DEPRECATED_SUPERVISED_USERS,
-  DEPRECATED_SUPERVISED_USER_SHARED_SETTINGS,
   DEPRECATED_ARTICLES,
   // App List items, used by the ChromeOS app launcher.
   APP_LIST,
@@ -255,7 +253,6 @@ constexpr ModelTypeSet ProtocolTypes() {
       EXTENSION_SETTINGS, HISTORY_DELETE_DIRECTIVES,
       DICTIONARY, FAVICON_IMAGES, FAVICON_TRACKING, DEVICE_INFO,
       PRIORITY_PREFERENCES, SUPERVISED_USER_SETTINGS,
-      DEPRECATED_SUPERVISED_USERS, DEPRECATED_SUPERVISED_USER_SHARED_SETTINGS,
       DEPRECATED_ARTICLES, APP_LIST, DEPRECATED_WIFI_CREDENTIALS,
       SUPERVISED_USER_WHITELISTS, ARC_PACKAGE, PRINTERS, READING_LIST,
       USER_EVENTS, NIGORI, DEPRECATED_EXPERIMENTS, MOUNTAIN_SHARES,

components/sync/driver/model_association_manager.cc

@@ -43,8 +43,7 @@ static const ModelType kStartOrder[] = {
     ARC_PACKAGE, READING_LIST, THEMES, SEARCH_ENGINES, SESSIONS, DICTIONARY,
     FAVICON_IMAGES, FAVICON_TRACKING, PRINTERS, USER_CONSENTS, USER_EVENTS,
     SUPERVISED_USER_SETTINGS, SUPERVISED_USER_WHITELISTS,
-    DEPRECATED_WIFI_CREDENTIALS, DEPRECATED_SUPERVISED_USERS, MOUNTAIN_SHARES,
-    DEPRECATED_SUPERVISED_USER_SHARED_SETTINGS, DEPRECATED_ARTICLES,
+    DEPRECATED_WIFI_CREDENTIALS, MOUNTAIN_SHARES, DEPRECATED_ARTICLES,
     SEND_TAB_TO_SELF, SECURITY_EVENTS, WEB_APPS, WIFI_CONFIGURATIONS};
 
 static_assert(base::size(kStartOrder) ==

components/sync/driver/sync_user_settings_impl.cc

@@ -186,7 +186,7 @@ ModelTypeSet SyncUserSettingsImpl::GetPreferredDataTypes() const {
     types.RetainAll(registered_model_types_);
   }
 
-  static_assert(43 == ModelType::NUM_ENTRIES,
+  static_assert(41 == ModelType::NUM_ENTRIES,
                 "If adding a new sync data type, update the list below below if"
                 " you want to disable the new data type for local sync.");
   types.PutAll(ControlTypes());

components/sync/nigori/nigori_sync_bridge_impl.cc

@@ -395,7 +395,7 @@ bool UpdateEncryptedTypes(const NigoriSpecifics& specifics,
 void UpdateNigoriSpecificsFromEncryptedTypes(
     ModelTypeSet encrypted_types,
     sync_pb::NigoriSpecifics* specifics) {
-  static_assert(43 == ModelType::NUM_ENTRIES,
+  static_assert(41 == ModelType::NUM_ENTRIES,
                 "If adding an encryptable type, update handling below.");
   specifics->set_encrypt_bookmarks(encrypted_types.Has(BOOKMARKS));
   specifics->set_encrypt_preferences(encrypted_types.Has(PREFERENCES));

components/sync/protocol/managed_user_shared_setting_specifics.proto

-// Copyright 2013 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.
-//
-// Sync protocol datatype extension for managed user shared settings.
-
-// If you change or add any fields in this file, update proto_visitors.h and
-// potentially proto_enum_conversions.{h, cc}.
-
-syntax = "proto2";
-
-option java_multiple_files = true;
-option java_package = "org.chromium.components.sync.protocol";
-
-option optimize_for = LITE_RUNTIME;
-
-package sync_pb;
-
-// Properties of managed user shared setting sync objects.
-message ManagedUserSharedSettingSpecifics {
-  // The MU ID for the managed user to whom the setting applies.
-  optional string mu_id = 1;
-  // The key of the setting.
-  optional string key = 2;
-  // The setting value. The setting is a JSON encoding of an arbitrary
-  // Javascript value.
-  optional string value = 3;
-  // This flag is set by the server to acknowledge that it has committed a
-  // change to a setting.
-  optional bool acknowledged = 4 [default = false];
-}

components/sync/protocol/managed_user_specifics.proto

-// Copyright 2013 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.
-//
-// Sync protocol datatype extension for managed user settings.
-
-// If you change or add any fields in this file, update proto_visitors.h and
-// potentially proto_enum_conversions.{h, cc}.
-
-syntax = "proto2";
-
-option java_multiple_files = true;
-option java_package = "org.chromium.components.sync.protocol";
-
-option optimize_for = LITE_RUNTIME;
-
-package sync_pb;
-
-// Properties of managed user sync objects.
-message ManagedUserSpecifics {
-  // A randomly-generated identifier for the managed user.
-  optional string id = 1;
-  // The human-visible name of the managed user
-  optional string name = 2;
-  // This flag is set by the server to acknowledge that it has committed a
-  // newly created managed user.
-  optional bool acknowledged = 3 [default = false];
-  // Master key for managed user cryptohome.
-  optional string master_key = 4;
-  // A string representing the index of the supervised user avatar on Chrome.
-  // It has the following format:
-  // "chrome-avatar-index:INDEX" where INDEX is an integer.
-  optional string chrome_avatar = 5;
-  // A string representing the index of the supervised user avatar on Chrome OS.
-  // It has the following format:
-  // "chromeos-avatar-index:INDEX" where INDEX is an integer.
-  optional string chromeos_avatar = 6;
-  // Key for signing supervised user's password.
-  optional string password_signature_key = 7;
-  // Key for encrypting supervised user's password.
-  optional string password_encryption_key = 8;
-}

components/sync/protocol/proto_value_conversions.cc

@@ -327,8 +327,6 @@ IMPLEMENT_PROTO_TO_VALUE(GlobalIdDirective)
 IMPLEMENT_PROTO_TO_VALUE(HistoryDeleteDirectiveSpecifics)
 IMPLEMENT_PROTO_TO_VALUE(LinkedAppIconInfo)
 IMPLEMENT_PROTO_TO_VALUE(ManagedUserSettingSpecifics)
-IMPLEMENT_PROTO_TO_VALUE(ManagedUserSharedSettingSpecifics)
-IMPLEMENT_PROTO_TO_VALUE(ManagedUserSpecifics)
 IMPLEMENT_PROTO_TO_VALUE(ManagedUserWhitelistSpecifics)
 IMPLEMENT_PROTO_TO_VALUE(MountainShareSpecifics)
 IMPLEMENT_PROTO_TO_VALUE(NavigationRedirect)

components/sync/protocol/proto_value_conversions.h

@@ -41,8 +41,6 @@ class FaviconTrackingSpecifics;
 class HistoryDeleteDirectiveSpecifics;
 class LinkedAppIconInfo;
 class ManagedUserSettingSpecifics;
-class ManagedUserSharedSettingSpecifics;
-class ManagedUserSpecifics;
 class ManagedUserWhitelistSpecifics;
 class MountainShareSpecifics;
 class NavigationRedirect;
@@ -170,13 +168,6 @@ std::unique_ptr<base::DictionaryValue> LinkedAppIconInfoToValue(
 std::unique_ptr<base::DictionaryValue> ManagedUserSettingSpecificsToValue(
     const sync_pb::ManagedUserSettingSpecifics& managed_user_setting_specifics);
 
-std::unique_ptr<base::DictionaryValue> ManagedUserSharedSettingSpecificsToValue(
-    const sync_pb::ManagedUserSharedSettingSpecifics&
-        managed_user_shared_setting_specifics);
-
-std::unique_ptr<base::DictionaryValue> ManagedUserSpecificsToValue(
-    const sync_pb::ManagedUserSpecifics& managed_user_specifics);
-
 std::unique_ptr<base::DictionaryValue> ManagedUserWhitelistSpecificsToValue(
     const sync_pb::ManagedUserWhitelistSpecifics&
         managed_user_whitelist_specifics);

components/sync/protocol/proto_value_conversions_unittest.cc

@@ -23,8 +23,6 @@
 #include "components/sync/protocol/favicon_image_specifics.pb.h"
 #include "components/sync/protocol/favicon_tracking_specifics.pb.h"
 #include "components/sync/protocol/managed_user_setting_specifics.pb.h"
-#include "components/sync/protocol/managed_user_shared_setting_specifics.pb.h"
-#include "components/sync/protocol/managed_user_specifics.pb.h"
 #include "components/sync/protocol/managed_user_whitelist_specifics.pb.h"
 #include "components/sync/protocol/nigori_specifics.pb.h"
 #include "components/sync/protocol/password_specifics.pb.h"
@@ -59,7 +57,7 @@ namespace {
 
 DEFINE_SPECIFICS_TO_VALUE_TEST(encrypted)
 
-static_assert(43 == syncer::ModelType::NUM_ENTRIES,
+static_assert(41 == syncer::ModelType::NUM_ENTRIES,
               "When adding a new field, add a DEFINE_SPECIFICS_TO_VALUE_TEST "
               "for your field below, and optionally a test for the specific "
               "conversions.");
@@ -81,9 +79,7 @@ DEFINE_SPECIFICS_TO_VALUE_TEST(extension_setting)
 DEFINE_SPECIFICS_TO_VALUE_TEST(favicon_image)
 DEFINE_SPECIFICS_TO_VALUE_TEST(favicon_tracking)
 DEFINE_SPECIFICS_TO_VALUE_TEST(history_delete_directive)
-DEFINE_SPECIFICS_TO_VALUE_TEST(managed_user)
 DEFINE_SPECIFICS_TO_VALUE_TEST(managed_user_setting)
-DEFINE_SPECIFICS_TO_VALUE_TEST(managed_user_shared_setting)
 DEFINE_SPECIFICS_TO_VALUE_TEST(managed_user_whitelist)
 DEFINE_SPECIFICS_TO_VALUE_TEST(mountain_share)
 DEFINE_SPECIFICS_TO_VALUE_TEST(nigori)

components/sync/protocol/proto_visitors.h

@@ -372,7 +372,7 @@ VISIT_PROTO_FIELDS(const sync_pb::EntityMetadata& proto) {
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::EntitySpecifics& proto) {
-  static_assert(43 == ModelType::NUM_ENTRIES,
+  static_assert(41 == ModelType::NUM_ENTRIES,
                 "When adding a new protocol type, you will likely need to add "
                 "it here as well.");
   VISIT(encrypted);
@@ -393,9 +393,7 @@ VISIT_PROTO_FIELDS(const sync_pb::EntitySpecifics& proto) {
   VISIT(favicon_image);
   VISIT(favicon_tracking);
   VISIT(history_delete_directive);
-  VISIT(managed_user);
   VISIT(managed_user_setting);
-  VISIT(managed_user_shared_setting);
   VISIT(managed_user_whitelist);
   VISIT(mountain_share);
   VISIT(nigori);
@@ -562,24 +560,6 @@ VISIT_PROTO_FIELDS(const sync_pb::ManagedUserSettingSpecifics& proto) {
   VISIT(value);
 }
 
-VISIT_PROTO_FIELDS(const sync_pb::ManagedUserSharedSettingSpecifics& proto) {
-  VISIT(mu_id);
-  VISIT(key);
-  VISIT(value);
-  VISIT(acknowledged);
-}
-
-VISIT_PROTO_FIELDS(const sync_pb::ManagedUserSpecifics& proto) {
-  VISIT(id);
-  VISIT(name);
-  VISIT(acknowledged);
-  VISIT(master_key);
-  VISIT(chrome_avatar);
-  VISIT(chromeos_avatar);
-  VISIT(password_signature_key);
-  VISIT(password_encryption_key);
-}
-
 VISIT_PROTO_FIELDS(const sync_pb::ManagedUserWhitelistSpecifics& proto) {
   VISIT(id);
   VISIT(name);

components/sync/protocol/protocol_sources.gni

@@ -29,8 +29,6 @@ sync_protocol_bases = [
   "history_status",
   "loopback_server",
   "managed_user_setting_specifics",
-  "managed_user_shared_setting_specifics",
-  "managed_user_specifics",
   "managed_user_whitelist_specifics",
   "model_type_state",
   "model_type_store_schema_descriptor",

components/sync/protocol/sync.proto

@@ -37,8 +37,6 @@ import "favicon_tracking_specifics.proto";
 import "get_updates_caller_info.proto";
 import "history_delete_directive_specifics.proto";
 import "managed_user_setting_specifics.proto";
-import "managed_user_shared_setting_specifics.proto";
-import "managed_user_specifics.proto";
 import "managed_user_whitelist_specifics.proto";
 import "mountain_share_specifics.proto";
 import "nigori_specifics.proto";
@@ -132,8 +130,6 @@ message EntitySpecifics {
     FaviconTrackingSpecifics favicon_tracking = 181534;
     FaviconImageSpecifics favicon_image = 182019;
     ManagedUserSettingSpecifics managed_user_setting = 186662;
-    ManagedUserSpecifics managed_user = 194582;
-    ManagedUserSharedSettingSpecifics managed_user_shared_setting = 202026;
     ManagedUserWhitelistSpecifics managed_user_whitelist = 306060;
     ArticleSpecifics article = 223759;
     AppListSpecifics app_list = 229170;
@@ -155,6 +151,10 @@ message EntitySpecifics {
   reserved "app_notification";
   reserved 153108;
   reserved "synced_notification";
+  reserved 194582;
+  reserved "managed_user";
+  reserved 202026;
+  reserved "managed_user_shared_setting";
   reserved 235816;
   reserved "synced_notification_app_info";
 }

components/sync/syncable/nigori_util.cc

@@ -265,7 +265,7 @@ void UpdateNigoriFromEncryptedTypes(ModelTypeSet encrypted_types,
                                     bool encrypt_everything,
                                     sync_pb::NigoriSpecifics* nigori) {
   nigori->set_encrypt_everything(encrypt_everything);
-  static_assert(43 == ModelType::NUM_ENTRIES,
+  static_assert(41 == ModelType::NUM_ENTRIES,
                 "If adding an encryptable type, update handling below.");
   nigori->set_encrypt_bookmarks(encrypted_types.Has(BOOKMARKS));
   nigori->set_encrypt_preferences(encrypted_types.Has(PREFERENCES));
@@ -301,7 +301,7 @@ ModelTypeSet GetEncryptedTypesFromNigori(
     return ModelTypeSet::All();
 
   ModelTypeSet encrypted_types;
-  static_assert(43 == ModelType::NUM_ENTRIES,
+  static_assert(41 == ModelType::NUM_ENTRIES,
                 "If adding an encryptable type, update handling below.");
   if (nigori.encrypt_bookmarks())
     encrypted_types.Put(BOOKMARKS);

ios/chrome/browser/sync/profile_sync_service_factory_unittest.cc

@@ -43,7 +43,7 @@ class ProfileSyncServiceFactoryTest : public PlatformTest {
  protected:
   // Returns the collection of default datatypes.
   std::vector<syncer::ModelType> DefaultDatatypes() {
-    static_assert(43 == syncer::ModelType::NUM_ENTRIES,
+    static_assert(41 == syncer::ModelType::NUM_ENTRIES,
                   "When adding a new type, you probably want to add it here as "
                   "well (assuming it is already enabled).");