| Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
|
| index b1d8e66364112e3ac16fc00ab7c3d46cca920abd..89a2508e76f51c30ef1e02d30af52a10d77c9cc0 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 @@ std::unique_ptr<em::PolicyData> OwnerSettingsServiceChromeOS::AssemblePolicy(
|
| 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>();
|
|
|
|
|