[Payments] Allow international phone from different country in shipping editor.

components/payments/core/payment_request_data_util.cc

 // Copyright 2017 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/payments/core/payment_request_data_util.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
@@ skipping 137 matching lines @@
           }
         }
       }
     }
   }
 }
 
 base::string16 GetFormattedPhoneNumberForDisplay(
     const autofill::AutofillProfile& profile,
     const std::string& locale) {
+  // Since the "+" is removed for some country's phone numbers, try to add a "+"
+  // and see if it is a valid phone number for a country.
+  // Having two "+" in front of a number has no effect on the formatted number.
+  // The reason for this is international phone numbers for another country. For
+  // example, without adding a "+", the US number 1-415-123-1234 for an AU
+  // address would be wrongly formatted as +61 1-415-123-1234 which is invalid.
+  std::string phone = base::UTF16ToUTF8(profile.GetInfo(
+      autofill::AutofillType(autofill::PHONE_HOME_WHOLE_NUMBER), locale));
+  std::string tentative_intl_phone = "+" + phone;
+
+  autofill::i18n::PhoneObject phone_obj(
+      base::UTF8ToUTF16(phone), GetCountryCodeWithFallback(&profile, locale));
+  autofill::i18n::PhoneObject tentative_intl_phone_obj(
+      base::UTF8ToUTF16(tentative_intl_phone),
+      GetCountryCodeWithFallback(&profile, locale));
+
+  // Always favor the tentative international phone number if it's determined as
+  // being a valid number.
+  if (!tentative_intl_phone_obj.region().empty()) {
+    return base::UTF8ToUTF16(FormatPhoneForDisplay(
+        tentative_intl_phone, GetCountryCodeWithFallback(&profile, locale)));
+  }
+
   return base::UTF8ToUTF16(FormatPhoneForDisplay(
-      base::UTF16ToUTF8(profile.GetInfo(
-          autofill::AutofillType(autofill::PHONE_HOME_WHOLE_NUMBER), locale)),
-      GetCountryCodeWithFallback(&profile, locale)));
+      phone, GetCountryCodeWithFallback(&profile, locale)));
 }
 
 std::string FormatPhoneForDisplay(const std::string& phone_number,
                                   const std::string& country_code) {
   return FormatPhoneNumber(phone_number, country_code,
                            PhoneNumberUtil::PhoneNumberFormat::INTERNATIONAL);
 }
 
 std::string FormatPhoneForResponse(const std::string& phone_number,
                                    const std::string& country_code) {
   return FormatPhoneNumber(phone_number, country_code,
                            PhoneNumberUtil::PhoneNumberFormat::E164);
 }
 
 std::string GetCountryCodeWithFallback(const autofill::AutofillProfile* profile,
                                        const std::string& app_locale) {
   std::string country_code =
       base::UTF16ToUTF8(profile->GetRawInfo(autofill::ADDRESS_HOME_COUNTRY));
   if (!autofill::data_util::IsValidCountryCode(country_code))
     country_code = autofill::AutofillCountry::CountryCodeForLocale(app_locale);
   return country_code;
 }
 
 }  // namespace data_util
 }  // namespace payments