Add explicit numerical ids to EnrollmentStatus::Status enum.

chrome/browser/chromeos/policy/enrollment_status_chromeos.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_STATUS_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_STATUS_CHROMEOS_H_
 
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
 
 namespace policy {
 
 // Describes the result of an enrollment operation, including the relevant error
 // codes received from the involved components.
 class EnrollmentStatus {
  public:
-  // Enrollment status codes.
+  // Enrollment status codes.  Do not change the order or the meaning of the
+  // existing codes to preserve the interpretability of old logfiles.
   enum Status {
-    STATUS_SUCCESS,                     // Enrollment succeeded.
-    STATUS_NO_STATE_KEYS,               // Server-backed state keys unavailable.
-    STATUS_REGISTRATION_FAILED,         // DM registration failed.
-    STATUS_REGISTRATION_BAD_MODE,       // Bad device mode.
-    STATUS_ROBOT_AUTH_FETCH_FAILED,     // API OAuth2 auth code failure.
-    STATUS_ROBOT_REFRESH_FETCH_FAILED,  // API OAuth2 refresh token failure.
-    STATUS_ROBOT_REFRESH_STORE_FAILED,  // Failed to store API OAuth2 token.
-    STATUS_POLICY_FETCH_FAILED,         // DM policy fetch failed.
-    STATUS_VALIDATION_FAILED,           // Policy validation failed.
-    STATUS_LOCK_ERROR,                  // Cryptohome failed to lock the device.
-    STATUS_LOCK_TIMEOUT,                // Timeout while waiting for the lock.
-    STATUS_LOCK_WRONG_USER,             // Locked to different domain.
-    STATUS_STORE_ERROR,                 // Failed to store the policy.
-    STATUS_STORE_TOKEN_AND_ID_FAILED,   // Failed to store DM token and device
-                                        // ID.
+    STATUS_SUCCESS = 0,                     // Enrollment succeeded.
+    STATUS_NO_STATE_KEYS = 1,               // Server-backed state keys
+                                            // unavailable.
+    STATUS_REGISTRATION_FAILED = 2,         // DM registration failed.
+    STATUS_REGISTRATION_BAD_MODE = 3,       // Bad device mode.
+    STATUS_ROBOT_AUTH_FETCH_FAILED = 4,     // API OAuth2 auth code failure.
+    STATUS_ROBOT_REFRESH_FETCH_FAILED = 5,  // API OAuth2 refresh token failure.
+    STATUS_ROBOT_REFRESH_STORE_FAILED = 6,  // Failed to store API OAuth2 token.
+    STATUS_POLICY_FETCH_FAILED = 7,         // DM policy fetch failed.
+    STATUS_VALIDATION_FAILED = 8,           // Policy validation failed.
+    STATUS_LOCK_ERROR = 9,                  // Cryptohome failed to lock the
+                                            // device.
+    STATUS_LOCK_TIMEOUT = 10,               // Timeout while waiting for the
+                                            // lock.
+    STATUS_LOCK_WRONG_USER = 11,            // Locked to different domain.
+    STATUS_STORE_ERROR = 12,                // Failed to store the policy.
+    STATUS_STORE_TOKEN_AND_ID_FAILED = 13,  // Failed to store DM token and
+                                            // device ID.
+    STATUS_COUNT = 14,                      // Not a status code.

[pastarmovj, 2014/10/30 14:08:50]

Thinking more about this - it might not compile because if you have switches on
this enum without default which I hope you do :) - they will not compile if the
y don't mention this value so you will have to either change the value to be the
same as the last meaning one or add it to all switches with a NOTREACHED inside.

[Thiemo Nagel, 2014/10/30 14:24:51]

Spot on.  I hadn't even tried compiling. :(

   };
 
   // Helpers for constructing errors for relevant cases.
   static EnrollmentStatus ForStatus(Status status);
   static EnrollmentStatus ForRegistrationError(
       DeviceManagementStatus client_status);
   static EnrollmentStatus ForFetchError(DeviceManagementStatus client_status);
   static EnrollmentStatus ForRobotAuthFetchError(
       DeviceManagementStatus client_status);
   static EnrollmentStatus ForRobotRefreshFetchError(int http_status);
@@ skipping 21 matching lines @@
   Status status_;
   DeviceManagementStatus client_status_;
   int http_status_;
   CloudPolicyStore::Status store_status_;
   CloudPolicyValidatorBase::Status validation_status_;
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_STATUS_CHROMEOS_H_