[Autofill] Disambiguate similar types before uploading.

components/autofill/core/browser/phone_number.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/phone_number.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
@@ skipping 171 matching lines @@
   if (matching_types->find(PHONE_HOME_WHOLE_NUMBER) == matching_types->end()) {
     base::string16 whole_number =
         GetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER), app_locale);
     if (!whole_number.empty()) {
       base::string16 normalized_number =
           i18n::NormalizePhoneNumber(text, GetRegion(*profile_, app_locale));
       if (normalized_number == whole_number)
         matching_types->insert(PHONE_HOME_WHOLE_NUMBER);
     }
   }
-
-  // If both PHONE_HOME_CITY_AND_NUMBER and PHONE_HOME_WHOLE_NUMBER are matched,
-  // it means there is no country code in the profile's phone number. In that
-  // case, we should only return PHONE_HOME_CITY_AND_NUMBER because it's more
-  // precise.
-  ServerFieldTypeSet::iterator whole_number_iterator =
-      matching_types->find(PHONE_HOME_WHOLE_NUMBER);
-  if (whole_number_iterator != matching_types->end() &&
-      matching_types->find(PHONE_HOME_CITY_AND_NUMBER) !=
-          matching_types->end()) {
-    matching_types->erase(whole_number_iterator);
-  }
 }
 
 void PhoneNumber::UpdateCacheIfNeeded(const std::string& app_locale) const {
   std::string region = GetRegion(*profile_, app_locale);
   if (!number_.empty() && cached_parsed_phone_.region() != region)
     cached_parsed_phone_ = i18n::PhoneObject(number_, region);
 }
 
 PhoneNumber::PhoneCombineHelper::PhoneCombineHelper() {
 }
@@ skipping 46 matching lines @@
 
   return i18n::ConstructPhoneNumber(
       country_, city_, phone_, GetRegion(profile, app_locale), value);
 }
 
 bool PhoneNumber::PhoneCombineHelper::IsEmpty() const {
   return phone_.empty() && whole_number_.empty();
 }
 
 }  // namespace autofill