Adjust autofill phone number format.

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 47 matching lines @@
                            base::string16* normalized_number) {
   PhoneNumberUtil::PhoneNumberFormat format =
       country_code.empty() ?
       PhoneNumberUtil::NATIONAL :
       PhoneNumberUtil::INTERNATIONAL;
 
   PhoneNumberUtil* phone_util = PhoneNumberUtil::GetInstance();
   std::string processed_number;
   phone_util->Format(number, format, &processed_number);
 
+  std::string region_code;
+  phone_util->GetRegionCodeForNumber(number, &region_code);
+
+  // Drop the leading '+' for US numbers as some US sites can't handle the "+",
+  // and in the US dialing "+1..." is the same as dialing "1...".
+  std::string prefix;
+  if (processed_number[0] == '+') {
+    processed_number = processed_number.substr(1);
+    if (region_code != "US")
+      prefix = "+";
+  }
+
   if (formatted_number)
-    *formatted_number = base::UTF8ToUTF16(processed_number);
+    *formatted_number = base::UTF8ToUTF16(prefix + processed_number);
 
   if (normalized_number) {
     phone_util->NormalizeDigitsOnly(&processed_number);
-    *normalized_number = base::UTF8ToUTF16(processed_number);
+    *normalized_number = base::UTF8ToUTF16(prefix + processed_number);
   }
 }
 
 }  // namespace
 
 namespace i18n {
 
 // Parses the number stored in |value| as it should be interpreted in the given
 // |default_region|, and stores the results into the remaining arguments.
 // The |default_region| should be sanitized prior to calling this function.
@@ skipping 209 matching lines @@
   number_ = other.number_;
 
   formatted_number_ = other.formatted_number_;
   whole_number_ = other.whole_number_;
 
   return *this;
 }
 
 }  // namespace i18n
 }  // namespace autofill