[Autofill] Distinguish between native field types and potentially HTML field types.

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/time/time.h"
 #include "components/autofill/core/browser/autofill_type.h"
@@ skipping 61 matching lines @@
 //   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 AutofillFieldType field_type,
+int GetFieldTypeGroupMetric(const ServerFieldType field_type,
                             const int metric,
                             const int num_possible_metrics) {
   DCHECK_LT(metric, num_possible_metrics);
 
   FieldTypeGroupForMetrics group;
   switch (AutofillType(field_type).group()) {
     case ::autofill::NO_GROUP:
       group = AMBIGUOUS;
       break;
 
@@ skipping 150 matching lines @@
   histogram->AddTime(duration);
 }
 
 // Logs a type quality metric.  The primary histogram name is constructed based
 // on |base_name| and |experiment_id|.  The field-specific histogram name also
 // factors in the |field_type|.  Logs a sample of |metric|, which should be in
 // the range [0, |num_possible_metrics|).
 void LogTypeQualityMetric(const std::string& base_name,
                           const int metric,
                           const int num_possible_metrics,
-                          const AutofillFieldType field_type,
+                          const ServerFieldType field_type,
                           const std::string& experiment_id) {
   DCHECK_LT(metric, num_possible_metrics);
 
   std::string histogram_name = base_name;
   if (!experiment_id.empty())
     histogram_name += "_" + experiment_id;
   LogUMAHistogramEnumeration(histogram_name, metric, num_possible_metrics);
 
   std::string sub_histogram_name = base_name + ".ByFieldType";
   if (!experiment_id.empty())
@@ skipping 210 matching lines @@
 void AutofillMetrics::LogDeveloperEngagementMetric(
     DeveloperEngagementMetric metric) const {
   DCHECK_LT(metric, NUM_DEVELOPER_ENGAGEMENT_METRICS);
 
   UMA_HISTOGRAM_ENUMERATION("Autofill.DeveloperEngagement", metric,
                             NUM_DEVELOPER_ENGAGEMENT_METRICS);
 }
 
 void AutofillMetrics::LogHeuristicTypePrediction(
     FieldTypeQualityMetric metric,
-    AutofillFieldType field_type,
+    ServerFieldType field_type,
     const std::string& experiment_id) const {
   LogTypeQualityMetric("Autofill.Quality.HeuristicType",
                        metric, NUM_FIELD_TYPE_QUALITY_METRICS,
                        field_type, experiment_id);
 }
 
 void AutofillMetrics::LogOverallTypePrediction(
     FieldTypeQualityMetric metric,
-    AutofillFieldType field_type,
+    ServerFieldType field_type,
     const std::string& experiment_id) const {
   LogTypeQualityMetric("Autofill.Quality.PredictedType",
                        metric, NUM_FIELD_TYPE_QUALITY_METRICS,
                        field_type, experiment_id);
 }
 
 void AutofillMetrics::LogServerTypePrediction(
     FieldTypeQualityMetric metric,
-    AutofillFieldType field_type,
+    ServerFieldType field_type,
     const std::string& experiment_id) const {
   LogTypeQualityMetric("Autofill.Quality.ServerType",
                        metric, NUM_FIELD_TYPE_QUALITY_METRICS,
                        field_type, experiment_id);
 }
 
 void AutofillMetrics::LogQualityMetric(QualityMetric metric,
                                        const std::string& experiment_id) const {
   DCHECK_LT(metric, NUM_QUALITY_METRICS);
 
@@ skipping 76 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