[Autofill] Fix phone upload bug.

components/autofill/core/browser/autofill_metrics_unittest.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 <stddef.h>
 
 #include <vector>
 
@@ skipping 405 matching lines @@
   test::CreateTestFormField("Select", "select", "USA", "select-one", &field);
   field.is_autofilled = false;
   form.fields.push_back(field);
   heuristic_types.push_back(UNKNOWN_TYPE);
   server_types.push_back(NO_SERVER_DATA);
 
   test::CreateTestFormField("Phone", "phone", "2345678901", "tel", &field);
   field.is_autofilled = true;
   form.fields.push_back(field);
   heuristic_types.push_back(PHONE_HOME_CITY_AND_NUMBER);
-  server_types.push_back(PHONE_HOME_WHOLE_NUMBER);
+  server_types.push_back(PHONE_HOME_CITY_AND_NUMBER);
 
   // Simulate having seen this form on page load.
   autofill_manager_->AddSeenForm(form, heuristic_types, server_types);
 
   // Simulate form submission.
   base::HistogramTester histogram_tester;
   autofill_manager_->SubmitForm(form, TimeTicks::Now());
 
   // Heuristic predictions.
   // Unknown:
   histogram_tester.ExpectBucketCount("Autofill.Quality.HeuristicType",
                                      AutofillMetrics::TYPE_UNKNOWN, 1);
   histogram_tester.ExpectBucketCount(
       "Autofill.Quality.HeuristicType.ByFieldType",
       GetFieldTypeGroupMetric(ADDRESS_HOME_COUNTRY,
                               AutofillMetrics::TYPE_UNKNOWN),
       1);
   // Match:
   histogram_tester.ExpectBucketCount("Autofill.Quality.HeuristicType",
                                      AutofillMetrics::TYPE_MATCH, 2);
   histogram_tester.ExpectBucketCount(
       "Autofill.Quality.HeuristicType.ByFieldType",
       GetFieldTypeGroupMetric(NAME_FULL, AutofillMetrics::TYPE_MATCH), 1);
   histogram_tester.ExpectBucketCount(
       "Autofill.Quality.HeuristicType.ByFieldType",
-      GetFieldTypeGroupMetric(PHONE_HOME_WHOLE_NUMBER,
+      GetFieldTypeGroupMetric(PHONE_HOME_CITY_AND_NUMBER,
                               AutofillMetrics::TYPE_MATCH),
       1);
   // Mismatch:
   histogram_tester.ExpectBucketCount("Autofill.Quality.HeuristicType",
                                      AutofillMetrics::TYPE_MISMATCH, 1);
   histogram_tester.ExpectBucketCount(
       "Autofill.Quality.HeuristicType.ByFieldType",
       GetFieldTypeGroupMetric(EMAIL_ADDRESS, AutofillMetrics::TYPE_MISMATCH),
       1);
 
@@ skipping 93 matching lines @@
   test::CreateTestFormField("Select", "select", "USA", "select-one", &field);
   field.is_autofilled = false;
   form.fields.push_back(field);
   heuristic_types.push_back(UNKNOWN_TYPE);
   server_types.push_back(NO_SERVER_DATA);
 
   test::CreateTestFormField("Phone", "phone", "2345678901", "tel", &field);
   field.is_autofilled = true;
   form.fields.push_back(field);
   heuristic_types.push_back(PHONE_HOME_CITY_AND_NUMBER);
-  server_types.push_back(PHONE_HOME_WHOLE_NUMBER);
+  server_types.push_back(PHONE_HOME_CITY_AND_NUMBER);
 
   // Simulate having seen this form on page load.
   autofill_manager_->AddSeenForm(form, heuristic_types, server_types);
 
   // Simulate text input on one of the fields.
   autofill_manager_->OnTextFieldDidChange(form, form.fields[0], TimeTicks());
 
   // Trigger a form upload and metrics by Resetting the manager.
   base::HistogramTester histogram_tester;
 
@@ skipping 2966 matching lines @@
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Autofill.ServerResponseHasDataForForm"),
       ElementsAre(Bucket(true, 2)));
 
   // No RAPPOR metrics are logged in the case there is at least some server data
   // available for all forms.
   EXPECT_EQ(0, rappor_service_.GetReportsCount());
 }
 
 }  // namespace autofill