Revert 282761 "Change PhoneNumber::SetInfo to only apply formatt..."

trunk/src/chrome/browser/ui/autofill/data_model_wrapper.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/autofill/data_model_wrapper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 117 matching lines @@
     const AutofillType& type) const {
   // We display the "raw" phone number which contains user-defined formatting.
   if (type.GetStorableType() == PHONE_HOME_WHOLE_NUMBER) {
     std::vector<base::string16> values;
     profile_->GetRawMultiInfo(type.GetStorableType(), &values);
     const base::string16& phone_number = values[GetVariantForType(type)];
 
     // If there is no user-defined formatting at all, add some standard
     // formatting.
     if (base::ContainsOnlyChars(phone_number,
-                                base::ASCIIToUTF16("+0123456789"))) {
+                                base::ASCIIToUTF16("0123456789"))) {
       std::string region = base::UTF16ToASCII(
           GetInfo(AutofillType(HTML_TYPE_COUNTRY_CODE, HTML_MODE_NONE)));
       i18n::PhoneObject phone(phone_number, region);
       base::string16 formatted_number = phone.GetFormattedNumber();
       // Formatting may fail.
       if (!formatted_number.empty())
         return formatted_number;
     }
 
     return phone_number;
@@ skipping 242 matching lines @@
   }
 
   return base::UTF8ToUTF16(address_->GetFieldValue(field));
 }
 
 const std::string& I18nAddressDataWrapper::GetLanguageCode() const {
   return address_->language_code;
 }
 
 }  // namespace autofill