[Autofill] Disambiguate similar types before uploading.

components/autofill/core/browser/phone_number.cc

Index: components/autofill/core/browser/phone_number.cc
diff --git a/components/autofill/core/browser/phone_number.cc b/components/autofill/core/browser/phone_number.cc
index d09117d201814eec96044e7af6457e1786db50bb..59f5e71834b2b3ecd30c4b460331751b5013fd3e 100644
--- a/components/autofill/core/browser/phone_number.cc
+++ b/components/autofill/core/browser/phone_number.cc
@@ -189,18 +189,6 @@ void PhoneNumber::GetMatchingTypes(const base::string16& text,
         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 {