Add RESTORE_MODE_DISABLED to RestoreMode

chrome/browser/chromeos/policy/auto_enrollment_client.cc

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..689f7ba494d9a3819380c13520ac3a132517f550 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.
@@ -233,13 +235,10 @@ void AutoEnrollmentClient::NextStep() {
     // Protocol finished successfully, report result.
     bool trigger_enrollment = false;
     if (retrieve_device_state_) {
-      const base::DictionaryValue* device_state_dict =
-          local_state_->GetDictionary(prefs::kServerBackedDeviceState);
-      std::string restore_mode;
-      device_state_dict->GetString(kDeviceStateRestoreMode, &restore_mode);
+      const RestoreMode restore_mode = GetRestoreMode();
       trigger_enrollment =
-          (restore_mode == kDeviceStateRestoreModeReEnrollmentRequested ||
-           restore_mode == kDeviceStateRestoreModeReEnrollmentEnforced);
+          (restore_mode == RESTORE_MODE_REENROLLMENT_REQUESTED ||
+           restore_mode == RESTORE_MODE_REENROLLMENT_ENFORCED);
     } else {
       trigger_enrollment = has_server_state_;
     }
@@ -412,11 +411,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(