Change PhoneNumber::SetInfo to only apply formatting where there is none

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 82 matching lines @@
   number->clear();
   *i18n_number = PhoneNumber();
 
   std::string number_text(base::UTF16ToUTF8(value));
 
   // Parse phone number based on the region.
   PhoneNumberUtil* phone_util = PhoneNumberUtil::GetInstance();
 
   // The |default_region| should already be sanitized.
   DCHECK_EQ(2U, default_region.size());
-  if (phone_util->Parse(number_text, default_region, i18n_number) !=
-          PhoneNumberUtil::NO_PARSING_ERROR) {
+  if (phone_util->ParseAndKeepRawInput(
+          number_text, default_region, i18n_number) !=
+      PhoneNumberUtil::NO_PARSING_ERROR) {
     return false;
   }
 
   if (!IsValidPhoneNumber(*i18n_number))
     return false;
 
   std::string national_significant_number;
   phone_util->GetNationalSignificantNumber(*i18n_number,
                                            &national_significant_number);
 
   int area_length = phone_util->GetLengthOfGeographicalAreaCode(*i18n_number);
   int destination_length =
       phone_util->GetLengthOfNationalDestinationCode(*i18n_number);
   // Some phones have a destination code in lieu of area code: mobile operators
   // in Europe, toll and toll-free numbers in USA, etc. From our point of view
   // these two types of codes are the same.
   if (destination_length > area_length)
     area_length = destination_length;
 
   std::string area_code;
   std::string subscriber_number;
   if (area_length > 0) {
     area_code = national_significant_number.substr(0, area_length);
     subscriber_number = national_significant_number.substr(area_length);
   } else {
     subscriber_number = national_significant_number;
   }
   *number = base::UTF8ToUTF16(subscriber_number);
   *city_code = base::UTF8ToUTF16(area_code);
-  *country_code = base::string16();
-
-  phone_util->NormalizeDigitsOnly(&number_text);
-  base::string16 normalized_number(base::UTF8ToUTF16(number_text));
 
   // Check if parsed number has a country code that was not inferred from the
   // region.
-  if (i18n_number->has_country_code()) {
+  if (i18n_number->has_country_code() &&
+      i18n_number->country_code_source() != PhoneNumber::FROM_DEFAULT_COUNTRY) {
     *country_code = base::UTF8ToUTF16(
         base::StringPrintf("%d", i18n_number->country_code()));
-    if (normalized_number.length() <= national_significant_number.length() &&
-        !StartsWith(normalized_number, *country_code,
-                    true /* case_sensitive */)) {
-      country_code->clear();
-    }
   }
 
   // The region might be different from what we started with.
   phone_util->GetRegionCodeForNumber(*i18n_number, inferred_region);
 
   return true;
 }
 
 base::string16 NormalizePhoneNumber(const base::string16& value,
                                     const std::string& region) {
@@ skipping 141 matching lines @@
   number_ = other.number_;
 
   formatted_number_ = other.formatted_number_;
   whole_number_ = other.whole_number_;
 
   return *this;
 }
 
 }  // namespace i18n
 }  // namespace autofill