[Autofill] Disambiguate similar types before uploading.

components/autofill/core/browser/autofill_metrics.cc

 // Copyright 2013 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.
 
 #include "components/autofill/core/browser/autofill_metrics.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 13 matching lines @@
   GROUP_COMPANY,
   GROUP_ADDRESS_LINE_1,
   GROUP_ADDRESS_LINE_2,
   GROUP_ADDRESS_CITY,
   GROUP_ADDRESS_STATE,
   GROUP_ADDRESS_ZIP,
   GROUP_ADDRESS_COUNTRY,
   GROUP_PHONE,
   GROUP_FAX,  // Deprecated.
   GROUP_EMAIL,
-  GROUP_CREDIT_CARD_NAME_FULL,
+  GROUP_CREDIT_CARD_NAME,
   GROUP_CREDIT_CARD_NUMBER,
   GROUP_CREDIT_CARD_DATE,
   GROUP_CREDIT_CARD_TYPE,
   GROUP_PASSWORD,
   GROUP_ADDRESS_LINE_3,
   GROUP_USERNAME,
+  GROUP_STREET_ADDRESS,
   NUM_FIELD_TYPE_GROUPS_FOR_METRICS
 };
 
 }  // namespace
 
 // First, translates |field_type| to the corresponding logical |group| from
 // |FieldTypeGroupForMetrics|.  Then, interpolates this with the given |metric|,
 // which should be in the range [0, |num_possible_metrics|).
 // Returns the interpolated index.
 //
@@ skipping 41 matching lines @@
       switch (AutofillType(field_type).GetStorableType()) {
         case ADDRESS_HOME_LINE1:
           group = GROUP_ADDRESS_LINE_1;
           break;
         case ADDRESS_HOME_LINE2:
           group = GROUP_ADDRESS_LINE_2;
           break;
         case ADDRESS_HOME_LINE3:
           group = GROUP_ADDRESS_LINE_3;
           break;
+        case ADDRESS_HOME_STREET_ADDRESS:
+          group = GROUP_STREET_ADDRESS;
         case ADDRESS_HOME_CITY:
           group = GROUP_ADDRESS_CITY;
           break;
         case ADDRESS_HOME_STATE:
           group = GROUP_ADDRESS_STATE;
           break;
         case ADDRESS_HOME_ZIP:
           group = GROUP_ADDRESS_ZIP;
           break;
         case ADDRESS_HOME_COUNTRY:
@@ skipping 11 matching lines @@
       break;
 
     case PHONE_HOME:
     case PHONE_BILLING:
       group = GROUP_PHONE;
       break;
 
     case CREDIT_CARD:
       switch (field_type) {
         case CREDIT_CARD_NAME_FULL:
-          group = GROUP_CREDIT_CARD_NAME_FULL;
+        case CREDIT_CARD_NAME_FIRST:
+        case CREDIT_CARD_NAME_LAST:
+          group = GROUP_CREDIT_CARD_NAME;
           break;
         case CREDIT_CARD_NUMBER:
           group = GROUP_CREDIT_CARD_NUMBER;
           break;
         case CREDIT_CARD_TYPE:
           group = GROUP_CREDIT_CARD_TYPE;
           break;
         case CREDIT_CARD_EXP_MONTH:
         case CREDIT_CARD_EXP_2_DIGIT_YEAR:
         case CREDIT_CARD_EXP_4_DIGIT_YEAR:
@@ skipping 696 matching lines @@
   else if (is_server_data_available_ && !is_local_data_available_)
     name += ".WithOnlyServerData";
   else if (!is_server_data_available_ && is_local_data_available_)
     name += ".WithOnlyLocalData";
   else
     name += ".WithBothServerAndLocalData";
   LogUMAHistogramEnumeration(name, event, NUM_FORM_EVENTS);
 }
 
 }  // namespace autofill