PolicyData proto: Obsolete "consumer" ManagementMode
Removing another remainder of consumer enrollment.
BUG=636318
Review-Url: https://codereview.chromium.org/2886403004
Cr-Commit-Position: refs/heads/master@{#472808}
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
index b1d8e66..89a2508 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
@@ -405,10 +405,8 @@
policy->set_timestamp(
(base::Time::Now() - base::Time::UnixEpoch()).InMilliseconds());
policy->set_username(user_id);
- if (policy_data->management_mode() == em::PolicyData::LOCAL_OWNER ||
- policy_data->management_mode() == em::PolicyData::CONSUMER_MANAGED) {
+ if (policy_data->management_mode() == em::PolicyData::LOCAL_OWNER)
FixupLocalOwnerPolicy(user_id, settings);
- }
if (!settings->SerializeToString(policy->mutable_policy_value()))
return std::unique_ptr<em::PolicyData>();
diff --git a/components/policy/proto/device_management_backend.proto b/components/policy/proto/device_management_backend.proto
index 855fa6a1..b557242 100644
--- a/components/policy/proto/device_management_backend.proto
+++ b/components/policy/proto/device_management_backend.proto
@@ -381,9 +381,8 @@
// The device is enterprise-managed. The policies come from the enterprise
// server. See the comment above for backward compatibility.
ENTERPRISE_MANAGED = 1;
- // The device is consumer-managed. The policies currently can only be set
- // by the local owner of the device.
- CONSUMER_MANAGED = 2;
+ // Obsolete. Don't use.
+ OBSOLETE_CONSUMER_MANAGED = 2;
}
optional ManagementMode management_mode = 16;
