Adjust autofill phone number format.

chrome/browser/ui/autofill/data_model_wrapper_unittest.cc

Index: chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
diff --git a/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc b/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
index 2df388eaed52c096572778edd0673a915bc0f810..52d7ac6a99fee357daee4d5b03f0df9c228e8cd3 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
+++ b/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
@@ -101,7 +101,7 @@ TEST(DataModelWrapperTest, GetDisplayText) {
   EXPECT_EQ(
       ASCIIToUTF16("John H. Doe, 666 Erebus St., Apt 8, Elysium, CA 91111\n"
                    "johndoe@hades.com\n"
-                   "+1 650-211-1111"),
+                   "1 650-211-1111"),
       horizontal);
   EXPECT_EQ(
       ASCIIToUTF16("John H. Doe\n"
@@ -109,7 +109,7 @@ TEST(DataModelWrapperTest, GetDisplayText) {
                    "Apt 8\n"
                    "Elysium, CA 91111\n"
                    "johndoe@hades.com\n"
-                   "+1 650-211-1111"),
+                   "1 650-211-1111"),
       vertical);
 
   // A Japanese address.
@@ -170,8 +170,10 @@ TEST(DataModelWrapperTest, GetDisplayPhoneNumber) {
   const base::string16 national_unformatted = ASCIIToUTF16("3104567890");
   const base::string16 national_formatted = ASCIIToUTF16("(310) 456-7890");
   const base::string16 international_unformatted = ASCIIToUTF16("13104567890");
+  const base::string16 international_unformatted_with_plus =
+      ASCIIToUTF16("+13104567890");
   const base::string16 international_formatted =
-      ASCIIToUTF16("+1 310-456-7890");
+      ASCIIToUTF16("1 310-456-7890");
   const base::string16 user_formatted = ASCIIToUTF16("310.456 78 90");
 
   scoped_ptr<wallet::WalletItems::MaskedInstrument> instrument(
@@ -210,6 +212,15 @@ TEST(DataModelWrapperTest, GetDisplayPhoneNumber) {
             address_wrapper.GetInfoForDisplay(
                 AutofillType(PHONE_HOME_WHOLE_NUMBER)));
 
+  const_cast<wallet::Address*>(&instrument->address())->
+      SetPhoneNumber(international_unformatted_with_plus);
+  EXPECT_EQ(national_formatted,
+            instrument_wrapper.GetInfoForDisplay(
+                AutofillType(PHONE_HOME_WHOLE_NUMBER)));
+  EXPECT_EQ(national_formatted,
+            address_wrapper.GetInfoForDisplay(
+                AutofillType(PHONE_HOME_WHOLE_NUMBER)));
+
   // Autofill numbers that are unformatted get formatted either nationally or
   // internationally depending on the presence of a country code. Formatted
   // numbers stay formatted.
@@ -217,6 +228,11 @@ TEST(DataModelWrapperTest, GetDisplayPhoneNumber) {
   EXPECT_EQ(international_formatted,
             profile_wrapper.GetInfoForDisplay(
                 AutofillType(PHONE_HOME_WHOLE_NUMBER)));
+  profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER,
+                     international_unformatted_with_plus);
+  EXPECT_EQ(international_formatted,
+            profile_wrapper.GetInfoForDisplay(
+                AutofillType(PHONE_HOME_WHOLE_NUMBER)));
   profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, national_unformatted);
   EXPECT_EQ(national_formatted,
             profile_wrapper.GetInfoForDisplay(
@@ -229,7 +245,6 @@ TEST(DataModelWrapperTest, GetDisplayPhoneNumber) {
   EXPECT_EQ(user_formatted,
             profile_wrapper.GetInfoForDisplay(
                 AutofillType(PHONE_HOME_WHOLE_NUMBER)));
-
 }
 
 }  // namespace autofill