Uses fine grained histogram buckets for CVC errors.

components/autofill/core/browser/autofill_metrics.h

Index: components/autofill/core/browser/autofill_metrics.h
diff --git a/components/autofill/core/browser/autofill_metrics.h b/components/autofill/core/browser/autofill_metrics.h
index 6146e858333eddc0b6c934f311ec99912d707ea8..d7463c886a18fba95c0f1c156db5a7f0d552b4bb 100644
--- a/components/autofill/core/browser/autofill_metrics.h
+++ b/components/autofill/core/browser/autofill_metrics.h
@@ -95,39 +95,41 @@ class AutofillMetrics {
   };
 
   enum CardUploadDecisionMetric {
-    // All the required conditions were satisfied and the card upload prompt was
-    // triggered.
+    // All the required conditions were satisfied using either the form fields
+    // or we prompted the user to fix one or more conditions in the card upload
+    // prompt.
     UPLOAD_OFFERED = 1 << 0,
-    // No CVC was detected. We don't know whether any addresses were available
-    // nor whether we would have been able to get upload details.
-    UPLOAD_NOT_OFFERED_NO_CVC = 1 << 1,
+    // CVC field was not found in the form.
+    CVC_FIELD_NOT_FOUND = 1 << 1,

[sebsg, 2017/05/05 15:15:31]

Please see the comment I wrote in the histograms page.

[csashi, 2017/05/05 16:29:55]

Acknowledged. That comment looks correct to me even with this change.

[sebsg, 2017/05/05 16:46:30]

Oh sorry it was not about the comment, it was about the values :)

+    // CVC field was found, but field did not have a value.
+    CVC_VALUE_NOT_FOUND = 1 << 2,
+    // CVC field had a value, but it was not valid for the card network.
+    INVALID_CVC_VALUE = 1 << 3,
     // A CVC was detected but no recently created or used address was available.
     // We don't know whether we would have been able to get upload details.
-    UPLOAD_NOT_OFFERED_NO_ADDRESS = 1 << 2,
+    UPLOAD_NOT_OFFERED_NO_ADDRESS = 1 << 4,
     // A CVC and one or more addresses were available but no name was found on
-    // either the card or the adress(es). We don't know whether the address(es)
+    // either the card or the address(es). We don't know whether the address(es)
     // were otherwise valid nor whether we would have been able to get upload
     // details.
-    UPLOAD_NOT_OFFERED_NO_NAME = 1 << 3,
-    // A CVC, multiple addresses, and a name were available but the adresses had
+    UPLOAD_NOT_OFFERED_NO_NAME = 1 << 5,
+    // A CVC, multiple addresses, and a name were available but the addresses
+    // had
     // conflicting zip codes. We don't know whether we would have been able to
     // get upload details.
-    UPLOAD_NOT_OFFERED_CONFLICTING_ZIPS = 1 << 4,
+    UPLOAD_NOT_OFFERED_CONFLICTING_ZIPS = 1 << 6,
     // A CVC, one or more addresses, and a name were available but no zip code
-    // was found on any of the adress(es). We don't know whether we would have
+    // was found on any of the address(es). We don't know whether we would have
     // been able to get upload details.
-    UPLOAD_NOT_OFFERED_NO_ZIP_CODE = 1 << 5,
-    // A CVC, one or more valid addresses, and a name were available but the
-    // request to Payments for upload details failed.
-    UPLOAD_NOT_OFFERED_GET_UPLOAD_DETAILS_FAILED = 1 << 6,
+    UPLOAD_NOT_OFFERED_NO_ZIP_CODE = 1 << 7,
     // A CVC and one or more addresses were available but the names on the card
     // and/or the addresses didn't match. We don't know whether the address(es)
     // were otherwise valid nor whether we would have been able to get upload
     // details.
-    UPLOAD_NOT_OFFERED_CONFLICTING_NAMES = 1 << 7,
-    // No CVC was detected, but valid addresses and names were.  Upload is still
-    // possible if the user manually enters CVC, so upload was offered.
-    UPLOAD_OFFERED_NO_CVC = 1 << 8,
+    UPLOAD_NOT_OFFERED_CONFLICTING_NAMES = 1 << 8,
+    // A CVC, one or more valid addresses, and a name were available but the
+    // request to Payments for upload details failed.
+    UPLOAD_NOT_OFFERED_GET_UPLOAD_DETAILS_FAILED = 1 << 9,
     // Update |kNumCardUploadDecisionMetrics| when adding new enum here.
   };
 
@@ -886,7 +888,7 @@ class AutofillMetrics {
   };
 
  private:
-  static const int kNumCardUploadDecisionMetrics = 9;
+  static const int kNumCardUploadDecisionMetrics = 10;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AutofillMetrics);
 };