Remove default case from autofill_metrics.cc::GetFieldTypeGroupMetric

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 "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/time/time.h"
@@ skipping 38 matching lines @@
   ADDRESS_STATE,
   ADDRESS_ZIP,
   ADDRESS_COUNTRY,
   PHONE,
   FAX,  // Deprecated.
   EMAIL,
   CREDIT_CARD_NAME,
   CREDIT_CARD_NUMBER,
   CREDIT_CARD_DATE,
   CREDIT_CARD_TYPE,
+  PASSWORD,
   NUM_FIELD_TYPE_GROUPS_FOR_METRICS
 };
 
 // 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.
 //
 // The interpolation maps the pair (|group|, |metric|) to a single index, so
 // that all the indicies for a given group are adjacent.  In particular, with
 // the groups {AMBIGUOUS, NAME, ...} combining with the metrics {UNKNOWN, MATCH,
 // MISMATCH}, we create this set of mapped indices:
 // {
 //   AMBIGUOUS+UNKNOWN,
 //   AMBIGUOUS+MATCH,
 //   AMBIGUOUS+MISMATCH,
 //   NAME+UNKNOWN,
 //   NAME+MATCH,
 //   NAME+MISMATCH,
 //   ...
 // }.
 //
 // Clients must ensure that |field_type| is one of the types Chrome supports
 // natively, e.g. |field_type| must not be a billng address.
 int GetFieldTypeGroupMetric(const ServerFieldType field_type,
                             const int metric,
                             const int num_possible_metrics) {
   DCHECK_LT(metric, num_possible_metrics);
 
-  FieldTypeGroupForMetrics group;
+  FieldTypeGroupForMetrics group = AMBIGUOUS;
   switch (AutofillType(field_type).group()) {
     case ::autofill::NO_GROUP:
       group = AMBIGUOUS;
       break;
 
     case ::autofill::NAME:
+    case ::autofill::NAME_BILLING:
       group = NAME;
       break;
 
     case ::autofill::COMPANY:
       group = COMPANY;
       break;
 
     case ::autofill::ADDRESS_HOME:
-      switch (field_type) {
+    case ::autofill::ADDRESS_BILLING:
+      switch (AutofillType(field_type).GetStorableType()) {
         case ADDRESS_HOME_LINE1:
           group = ADDRESS_LINE_1;
           break;
         case ADDRESS_HOME_LINE2:
           group = ADDRESS_LINE_2;
           break;
         case ADDRESS_HOME_CITY:
           group = ADDRESS_CITY;
           break;
         case ADDRESS_HOME_STATE:
           group = ADDRESS_STATE;
           break;
         case ADDRESS_HOME_ZIP:
           group = ADDRESS_ZIP;
           break;
         case ADDRESS_HOME_COUNTRY:
           group = ADDRESS_COUNTRY;
           break;
         default:
           NOTREACHED();
           group = AMBIGUOUS;
+          break;
       }
       break;
 
     case ::autofill::EMAIL:
       group = EMAIL;
       break;
 
     case ::autofill::PHONE_HOME:
+    case ::autofill::PHONE_BILLING:
       group = PHONE;
       break;
 
     case ::autofill::CREDIT_CARD:
       switch (field_type) {
         case ::autofill::CREDIT_CARD_NAME:
           group = CREDIT_CARD_NAME;
           break;
         case ::autofill::CREDIT_CARD_NUMBER:
           group = CREDIT_CARD_NUMBER;
           break;
         case ::autofill::CREDIT_CARD_TYPE:
           group = CREDIT_CARD_TYPE;
           break;
+        case ::autofill::CREDIT_CARD_EXP_MONTH:
+        case ::autofill::CREDIT_CARD_EXP_2_DIGIT_YEAR:
+        case ::autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR:
+        case ::autofill::CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR:
+        case ::autofill::CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR:
+          group = CREDIT_CARD_DATE;
+          break;
         default:
-          group = CREDIT_CARD_DATE;
+          NOTREACHED();
+          group = AMBIGUOUS;
+          break;
       }
       break;
 
-    default:
-      NOTREACHED();
-      group = AMBIGUOUS;
+    case ::autofill::PASSWORD_FIELD:
+      group = PASSWORD;
+      break;
   }
 
   // Interpolate the |metric| with the |group|, so that all metrics for a given
   // |group| are adjacent.
   return (group * num_possible_metrics) + metric;
 }
 
 std::string WalletApiMetricToString(
     AutofillMetrics::WalletApiCallMetric metric) {
   switch (metric) {
@@ skipping 351 matching lines @@
     const std::string& experiment_id) const {
   LogServerExperimentId("Autofill.ServerExperimentId.Query", experiment_id);
 }
 
 void AutofillMetrics::LogServerExperimentIdForUpload(
     const std::string& experiment_id) const {
   LogServerExperimentId("Autofill.ServerExperimentId.Upload", experiment_id);
 }
 
 }  // namespace autofill