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 235 matching lines @@
   } else {
     // Parsing failed. Store passed phone "as is" into |whole_number_|.
     whole_number_ = number;
   }
 }
 
 PhoneObject::PhoneObject(const PhoneObject& other) { *this = other; }
 
 PhoneObject::PhoneObject() {}
 
-PhoneObject::~PhoneObject() {
-}
+PhoneObject::~PhoneObject() {}
 
 base::string16 PhoneObject::GetFormattedNumber() const {
   if (i18n_number_ && formatted_number_.empty()) {
     FormatValidatedNumber(*i18n_number_, country_code_, &formatted_number_,
                           &whole_number_);
   }
 
   return formatted_number_;
 }
 
+base::string16 PhoneObject::GetNationallyFormattedNumber() const {
+  base::string16 formatted = whole_number_;
+  if (i18n_number_)
+    FormatValidatedNumber(*i18n_number_, base::string16(), &formatted, NULL);
+
+  return formatted;
+}
+
 base::string16 PhoneObject::GetWholeNumber() const {
   if (i18n_number_ && whole_number_.empty()) {
     FormatValidatedNumber(*i18n_number_, country_code_, &formatted_number_,
                           &whole_number_);
   }
 
   return whole_number_;
 }
 
 PhoneObject& PhoneObject::operator=(const PhoneObject& other) {
@@ skipping 12 matching lines @@
   number_ = other.number_;
 
   formatted_number_ = other.formatted_number_;
   whole_number_ = other.whole_number_;
 
   return *this;
 }
 
 }  // namespace i18n
 }  // namespace autofill