Remove FieldTypeSubGroups from the AutofillType class.

chrome/browser/autofill/autofill_metrics.cc

 // Copyright (c) 2011 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 "chrome/browser/autofill/autofill_metrics.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "chrome/browser/autofill/autofill_type.h"
@@ skipping 102 matching lines @@
         default:
           NOTREACHED();
           group = AMBIGUOUS;
       }
       break;
 
     case AutofillType::EMAIL:
       group = EMAIL;
       break;
 
-    case AutofillType::PHONE_HOME:
+    case AutofillType::PHONE:
       group = PHONE;
       break;
 
     case AutofillType::CREDIT_CARD:
       switch (field_type) {
         case ::CREDIT_CARD_NAME:
           group = CREDIT_CARD_NAME;
           break;
         case ::CREDIT_CARD_NUMBER:
           group = CREDIT_CARD_NUMBER;
@@ skipping 217 matching lines @@
 
 void AutofillMetrics::LogServerExperimentIdForQuery(
     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);
 }