[Autofill] Fix phone upload bug.

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 131 matching lines @@
                  number_, GetRegion(*profile_, app_locale)).empty()) {
     // The number doesn't make sense for this region; clear it.
     number_.clear();
   }
   return !number_.empty();
 }
 
 void PhoneNumber::GetMatchingTypes(const base::string16& text,
                                    const std::string& app_locale,
                                    ServerFieldTypeSet* matching_types) const {
+  // Strip the common phone number non numerical characters before calling the
+  // base matching type function. For example, the |text| "(514) 121-1523"
+  // would become the stripped text "5141211523". Since the base matching
+  // function only does simple canonicalization to match against the stored
+  // data, some domain specific cases will be covered below.
   base::string16 stripped_text = text;
   base::RemoveChars(stripped_text, base::ASCIIToUTF16(" .()-"), &stripped_text);
   FormGroup::GetMatchingTypes(stripped_text, app_locale, matching_types);
 
   // For US numbers, also compare to the three-digit prefix and the four-digit
   // suffix, since web sites often split numbers into these two fields.
   base::string16 number = GetInfo(AutofillType(PHONE_HOME_NUMBER), app_locale);
   if (GetRegion(*profile_, app_locale) == "US" &&
       number.size() == (kPrefixLength + kSuffixLength)) {
     base::string16 prefix = number.substr(kPrefixOffset, kPrefixLength);
     base::string16 suffix = number.substr(kSuffixOffset, kSuffixLength);
     if (text == prefix || text == suffix)
       matching_types->insert(PHONE_HOME_NUMBER);
   }
 
-  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);
+  // TODO(crbug.com/581391): Investigate the use of PhoneNumberUtil when
+  // matching phone numbers for upload.
+  // If there is not already a match for PHONE_HOME_WHOLE_NUMBER, normalize the
+  // |text| based on the app_locale before comparing it to the whole number. For
+  // example, the France number "33 2 49 19 70 70" would be normalized to
+  // "+33249197070" whereas the US number "+1 (234) 567-8901" would be
+  // normalized to "12345678901".
+  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 47 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