rAc: phone number cleanup

components/autofill/core/browser/phone_number_i18n.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_i18n.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 231 matching lines @@
     // The phone number was successfully parsed, so store the parsed version.
     // The formatted and normalized versions will be set on the first call to
     // the coresponding methods.
     i18n_number_.reset(i18n_number.release());
   } else {
     // Parsing failed. Store passed phone "as is" into |whole_number_|.
     whole_number_ = number;
   }
 }
 
+base::string16 FormatPhoneNumberForRegion(const base::string16& whole_number,
+                                          const std::string& region) {
+  PhoneNumber phone_number;
+  PhoneNumberUtil* phone_util = PhoneNumberUtil::GetInstance();
+  if (phone_util->Parse(UTF16ToUTF8(whole_number),
+                        region,
+                        &phone_number) != PhoneNumberUtil::NO_PARSING_ERROR) {
+    return base::string16();
+  }
+
+  std::string formatted_number;
+  phone_util->Format(phone_number,
+                     PhoneNumberUtil::PhoneNumberFormat::NATIONAL,
+                     &formatted_number);
+  return UTF8ToUTF16(formatted_number);
+}

[Ilya Sherman, 2013/09/26 22:01:06]

Please still move this above the PhoneObject constructor ;)

Though, it might be cleaner to just add a GetNationalFormattedNumber() method to
the PhoneObject class.

[Evan Stade, 2013/09/27 00:29:17]

Done.

+
 PhoneObject::PhoneObject(const PhoneObject& other) { *this = other; }
 
 PhoneObject::PhoneObject() {}
 
 PhoneObject::~PhoneObject() {
 }
 
 base::string16 PhoneObject::GetFormattedNumber() const {
   if (i18n_number_ && formatted_number_.empty()) {
     FormatValidatedNumber(*i18n_number_, country_code_, &formatted_number_,
@@ skipping 28 matching lines @@
   number_ = other.number_;
 
   formatted_number_ = other.formatted_number_;
   whole_number_ = other.whole_number_;
 
   return *this;
 }
 
 }  // namespace i18n
 }  // namespace autofill