| Index: chrome/browser/chromeos/policy/auto_enrollment_client.cc
|
| diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client.cc b/chrome/browser/chromeos/policy/auto_enrollment_client.cc
|
| index e6e241cd8a72f86ea85504873e5bf73e043b6d77..9eacb861538b0c65c26b9dc5f51d8bd37d0e97b7 100644
|
| --- a/chrome/browser/chromeos/policy/auto_enrollment_client.cc
|
| +++ b/chrome/browser/chromeos/policy/auto_enrollment_client.cc
|
| @@ -74,6 +74,8 @@ std::string ConvertRestoreMode(
|
| return kDeviceStateRestoreModeReEnrollmentRequested;
|
| case em::DeviceStateRetrievalResponse::RESTORE_MODE_REENROLLMENT_ENFORCED:
|
| return kDeviceStateRestoreModeReEnrollmentEnforced;
|
| + case em::DeviceStateRetrievalResponse::RESTORE_MODE_DISABLED:
|
| + return kDeviceStateRestoreModeDisabled;
|
| }
|
|
|
| // Return is required to avoid compiler warning.
|
| @@ -412,11 +414,6 @@ bool AutoEnrollmentClient::OnDeviceStateRequestCompletion(
|
| new base::StringValue(restore_mode));
|
|
|
| UpdateDict(dict.Get(),
|
| - kDeviceStateDisabled,
|
| - true /* set_or_clear */,
|
| - new base::FundamentalValue(
|
| - state_response.has_disabled_state()));
|
| - UpdateDict(dict.Get(),
|
| kDeviceStateDisabledMessage,
|
| state_response.has_disabled_state(),
|
| new base::StringValue(
|
|
|