Recategorize ARC auth sign in errors.

chrome/browser/chromeos/arc/arc_optin_uma.h

Index: chrome/browser/chromeos/arc/arc_optin_uma.h
diff --git a/chrome/browser/chromeos/arc/arc_optin_uma.h b/chrome/browser/chromeos/arc/arc_optin_uma.h
index 28246cfb329b9d1ebf8a08697930b459962315df..5955f6f6ad48f95aa5e95adc7b798714602febab 100644
--- a/chrome/browser/chromeos/arc/arc_optin_uma.h
+++ b/chrome/browser/chromeos/arc/arc_optin_uma.h
@@ -24,26 +24,59 @@ enum class OptInActionType : int {
 };
 
 enum class OptInCancelReason {
-  USER_CANCEL = 0,                  // Canceled by user.
-  UNKNOWN_ERROR = 1,                // Unclassified failure.
-  NETWORK_ERROR = 2,                // Network failure.
-  SERVICE_UNAVAILABLE = 3,          // GMS Services are not available.
-  BAD_AUTHENTICATION = 4,           // Bad authentication returned by server.
-  GMS_CORE_NOT_AVAILABLE = 5,       // GMS Core is not available.
+  USER_CANCEL = 0,          // Canceled by user.
+  UNKNOWN_ERROR = 1,        // Unclassified failure.
+  NETWORK_ERROR = 2,        // Network failure.
+  SERVICE_UNAVAILABLE = 3,  // GMS Services are not available.
+  DEPRECATED_BAD_AUTHENTICATION = 4,
+  DEPRECATED_GMS_CORE_NOT_AVAILABLE = 5,
   CLOUD_PROVISION_FLOW_FAIL = 6,    // Cloud provision flow failed.
   ANDROID_MANAGEMENT_REQUIRED = 7,  // Android management is required for user.
   SIZE,                             // The size of this enum; keep last.
 };
 
-enum class ProvisioningResult {
-  SUCCESS = 0,                    // Provisioning was successful.

[khmel, 2016/07/29 14:47:27]

Would not we update tools/metrics/histograms/histograms.xml?

<enum name="ArcProvisioningResult" type="int">
  <summary>Defines Arc Provisioning success and failure reasons</summary>
  <int value="0" label="Success"/>
  <int value="1" label="Unclassified failure"/>
  <int value="2" label="Network failure"/>
  <int value="3" label="GMS Services are not available"/>
  <int value="4" label="Bad authentication returned by server"/>
  <int value="5" label="GMS Core is not available"/>
  <int value="6" label="Cloud provision flow failed"/>
</enum>

-  UNKNOWN_ERROR = 1,              // Unclassified failure.
-  NETWORK_ERROR = 2,              // Network failure.
-  SERVICE_UNAVAILABLE = 3,        // GMS Services are not available.
-  BAD_AUTHENTICATION = 4,         // Bad authentication returned by server.
-  GMS_CORE_NOT_AVAILABLE = 5,     // GMS Core is not available.
-  CLOUD_PROVISION_FLOW_FAIL = 6,  // Cloud provision flow failed.
-  SIZE,                           // The size of this enum; keep last.
+// The values should be listed in ascending order for SIZE a last, for safety.
+// For detailed meaning, please see also to auth.mojom.
+enum class ProvisioningResult : int {
+  // Provisioning was successful.
+  SUCCESS = 0,
+
+  // Unclassified failure.
+  UNKNOWN_ERROR = 1,
+
+  // GMS errors. More errors defined below.
+  GMS_NETWORK_ERROR = 2,
+  GMS_SERVICE_UNAVAILABLE = 3,
+  GMS_BAD_AUTHENTICATION = 4,
+
+  // Check in error. More errors defined below.
+  DEVICE_CHECK_IN_FAILED = 5,
+
+  // Cloud provision error. More errors defined below.
+  CLOUD_PROVISION_FLOW_FAILED = 6,
+
+  // Mojo errors.
+  MOJO_VERSION_MISMATCH = 7,
+  MOJO_CALL_TIMEOUT = 8,
+
+  // Check in error.
+  DEVICE_CHECK_IN_TIMEOUT = 9,
+  DEVICE_CHECK_IN_INTERNAL_ERROR = 10,
+
+  // GMS errors:
+  GMS_SIGN_IN_FAILED = 11,
+  GMS_SIGN_IN_TIMEOUT = 12,
+  GMS_SIGN_IN_INTERNAL_ERROR = 13,
+
+  // Cloud provision error:
+  CLOUD_PROVISION_FLOW_TIMEOUT = 14,
+  CLOUD_PROVISION_FLOW_INTERNAL_ERROR = 15,
+
+  // ARC instance is stopped during the sign in procedure.
+  ARC_STOPPED = 16,
+
+  // The size of this enum; keep last.
+  SIZE,
 };
 
 void UpdateOptInActionUMA(OptInActionType type);