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);
 
-  if (formatted_number)
-    *formatted_number = base::UTF8ToUTF16(processed_number);
+  std::string region_code;
+  phone_util->GetRegionCodeForNumber(number, &region_code);
+
+  if (formatted_number) {
+    // 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...".
+    if (processed_number[0] == '+' && region_code == "US") {
+      *formatted_number = base::UTF8ToUTF16(
+          processed_number.substr(1, processed_number.length()));

[Ilya Sherman, 2014/07/16 17:50:17]

nit: foo.substr(1, foo.length()) is equivalent to just foo.substr(1)

+    } else {
+      *formatted_number = base::UTF8ToUTF16(processed_number);
+    }
+  }
 
   if (normalized_number) {
-    phone_util->NormalizeDigitsOnly(&processed_number);
+    // Keep the leading '+' while normalising numbers, excluding US numbers.

[Ilya Sherman, 2014/07/16 17:50:17]

nit: "normalising" -> "normalizing"

+    if (processed_number[0] == '+' && region_code != "US") {
+      processed_number = processed_number.substr(1, processed_number.length());

[Ilya Sherman, 2014/07/16 17:50:17]

(here too)

[Evan Stade, 2014/07/17 00:54:48]

why do you have to remove the '+' then re-add it? What happens if you don't
remove it?

[ziran.sun, 2014/07/17 12:35:36]

NormalizeDigitsOnly () will remove the '+' sign. For non-US international
numbers, we'd like to keep '+' on.

[Evan Stade, 2014/07/17 17:28:50]

If NormalizeDigitsOnly () will remove the '+' sign, why do you have to remove it
on L85?

[Ilya Sherman, 2014/07/17 18:44:33]

Evan, the code is structured differently now.  Do you still have this concern?

[Evan Stade, 2014/07/17 18:53:49]

nope

+      phone_util->NormalizeDigitsOnly(&processed_number);
+      processed_number.insert(processed_number.begin(), '+');
+    } else {
+      phone_util->NormalizeDigitsOnly(&processed_number);
+    }
     *normalized_number = base::UTF8ToUTF16(processed_number);
   }

[Ilya Sherman, 2014/07/16 17:50:17]

It might be cleaner to factor out the code that splits off the leading plus
sign, like below.  WDYT?

// 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] == '+') {
  process_number = process_number.substr(1);
  if (region_code == "US")
    prefix = "+";
}

if (formatted_number)
  *formatted_number = base::UTF8ToUTF16(prefix + processed_number);

if (normalized_number) {
  phone_util->NormalizeDigitsOnly(&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.
 bool ParsePhoneNumber(const base::string16& value,
@@ skipping 208 matching lines @@
   number_ = other.number_;
 
   formatted_number_ = other.formatted_number_;
   whole_number_ = other.whole_number_;
 
   return *this;
 }
 
 }  // namespace i18n
 }  // namespace autofill