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

components/autofill/core/browser/phone_number.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.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 116 matching lines @@
 }
 
 bool PhoneNumber::SetInfo(const AutofillType& type,
                           const base::string16& value,
                           const std::string& app_locale) {
   SetRawInfo(type.GetStorableType(), value);
 
   if (number_.empty())
     return true;
 
-  // Store a formatted (i.e., pretty printed) version of the number.
+  // Store a formatted (i.e., pretty printed) version of the number, but only if
+  // the number doesn't contain any other formatting. If there is formatting,
+  // assume the user provided it and wants to keep it.
   UpdateCacheIfNeeded(app_locale);
-  number_ = cached_parsed_phone_.GetFormattedNumber();
+  if (base::ContainsOnlyChars(number_,
+                              base::ASCIIToUTF16("0123456789"))) {

[Ilya Sherman, 2014/07/08 23:53:54]

The '+' sign should also be treated as an unformatted number, as it is actually
a required part of the number.  (The similar check in the requestAutocomplete
DataModelWrapper class should be updated as well.)

[Evan Stade, 2014/07/08 23:58:31]

Done.

+    number_ = cached_parsed_phone_.GetFormattedNumber();
+  }
   return !number_.empty();
 }
 
 void PhoneNumber::GetMatchingTypes(const base::string16& text,
                                    const std::string& app_locale,
                                    ServerFieldTypeSet* matching_types) const {
   base::string16 stripped_text = text;
   base::RemoveChars(stripped_text, base::ASCIIToUTF16(" .()-"), &stripped_text);
   FormGroup::GetMatchingTypes(stripped_text, app_locale, matching_types);
 
@@ skipping 75 matching lines @@
 
   return i18n::ConstructPhoneNumber(
       country_, city_, phone_, GetRegion(profile, app_locale), value);
 }
 
 bool PhoneNumber::PhoneCombineHelper::IsEmpty() const {
   return phone_.empty() && whole_number_.empty();
 }
 
 }  // namespace autofill