rAc: phone number cleanup

components/autofill/content/browser/wallet/wallet_address.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/content/browser/wallet/wallet_address.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 109 matching lines @@
                  const string16& postal_code_number,
                  const string16& phone_number,
                  const std::string& object_id)
     : country_name_code_(country_name_code),
       recipient_name_(recipient_name),
       address_line_1_(address_line_1),
       address_line_2_(address_line_2),
       locality_name_(locality_name),
       administrative_area_name_(administrative_area_name),
       postal_code_number_(postal_code_number),
-      phone_number_(phone_number),
       object_id_(object_id),
       is_complete_address_(true) {
+  // Wallet doesn't store user phone number formatting, so just strip all
+  // formatting.
+  i18n::PhoneObject phone(phone_number, country_name_code);
+  phone_number_ = phone.GetWholeNumber();
 }
 
 Address::~Address() {}
 
 // static
 scoped_ptr<Address> Address::CreateAddressWithID(
     const base::DictionaryValue& dictionary) {
   std::string object_id;
   if (!dictionary.GetString("id", &object_id)) {
     DLOG(ERROR) << "Response from Google Wallet missing object id";
@@ skipping 112 matching lines @@
 
 string16 Address::DisplayNameDetail() const {
 #if defined(OS_ANDROID)
   // TODO(aruslan): improve this stub implementation.
   return address_line_1();
 #else
   return string16();
 #endif
 }
 
+string16 Address::DisplayPhoneNumber() const {
+  // Return a formatted phone number. Wallet doesn't store user formatting, so
+  // impose our own. phone_number() always includes a country code, so using
+  // PhoneObject to format it would result in an internationalized format. Since
+  // Wallet only supports the US right now, stick to national formatting.
+  return i18n::FormatPhoneNumberForRegion(phone_number(), country_name_code());
+}
+
 string16 Address::GetInfo(const AutofillType& type,
                           const std::string& app_locale) const {
   if (type.html_type() == HTML_TYPE_COUNTRY_CODE) {
     DCHECK(IsStringASCII(country_name_code()));
     return ASCIIToUTF16(country_name_code());
   } else if (type.html_type() == HTML_TYPE_STREET_ADDRESS) {
     base::string16 address = address_line_1();
     if (!address_line_2().empty())
       address += ASCIIToUTF16(", ") + address_line_2();
     return address;
@@ skipping 48 matching lines @@
 bool Address::operator==(const Address& other) const {
   return object_id_ == other.object_id_ && EqualsIgnoreID(other);
 }
 
 bool Address::operator!=(const Address& other) const {
   return !(*this == other);
 }
 
 }  // namespace wallet
 }  // namespace autofill