Adjust autofill phone number format.

chrome/browser/ui/autofill/data_model_wrapper_unittest.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 "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
@@ skipping 80 matching lines @@
   EXPECT_EQ(base::string16(),
             address_wrapper.GetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER)));
   EXPECT_FALSE(address_wrapper.GetDisplayText(&unused, &unused2));
 }
 
 TEST(DataModelWrapperTest, GetDisplayText) {
   AutofillProfile profile = test::GetFullProfile();
   base::string16 vertical, horizontal;
   EXPECT_TRUE(
       AutofillProfileWrapper(&profile).GetDisplayText(&horizontal, &vertical));
-  EXPECT_EQ(
-      ASCIIToUTF16("John H. Doe, 666 Erebus St., Apt 8, Elysium, CA 91111\n"
-                   "johndoe@hades.com\n"
-                   "+1 650-211-1111"),
-      horizontal);
-  EXPECT_EQ(
-      ASCIIToUTF16("John H. Doe\n"
-                   "666 Erebus St.\n"
-                   "Apt 8\n"
-                   "Elysium, CA 91111\n"
-                   "johndoe@hades.com\n"
-                   "+1 650-211-1111"),
-      vertical);
+  EXPECT_EQ(ASCIIToUTF16(
+                "John H. Doe, 666 Erebus St., Apt 8, Elysium, CA 91111\n"
+                "johndoe@hades.com\n"
+                "1 650-211-1111"),
+            horizontal);
+  EXPECT_EQ(ASCIIToUTF16(
+                "John H. Doe\n"
+                "666 Erebus St.\n"
+                "Apt 8\n"
+                "Elysium, CA 91111\n"
+                "johndoe@hades.com\n"
+                "1 650-211-1111"),
+            vertical);
 
   // A Japanese address.
   AutofillProfile foreign_profile(
       base::GenerateGUID(), "http://www.example.com/");
   foreign_profile.SetRawInfo(
       ADDRESS_HOME_COUNTRY, ASCIIToUTF16("JP"));
   foreign_profile.SetRawInfo(
       ADDRESS_HOME_STATE,
       base::WideToUTF16(L"\u6771\u4EAC\u90FD"));
   foreign_profile.SetRawInfo(
@@ skipping 39 matching lines @@
     WalletInstrumentWrapper wrapper(instrument.get());
     EXPECT_EQ(model.GetItemAt(month),
               wrapper.GetInfo(AutofillType(CREDIT_CARD_EXP_MONTH)));
   }
 }
 
 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_formatted =
-      ASCIIToUTF16("+1 310-456-7890");
+  const base::string16 international_unformatted_with_plus =
+      ASCIIToUTF16("+13104567890");
+  const base::string16 international_formatted = ASCIIToUTF16("1 310-456-7890");
   const base::string16 user_formatted = ASCIIToUTF16("310.456 78 90");
 
   scoped_ptr<wallet::WalletItems::MaskedInstrument> instrument(
       wallet::GetTestMaskedInstrument());
   AutofillProfile profile(test::GetVerifiedProfile());
 
   // No matter what format a wallet number is in, it gets formatted in a
   // standard way.
   WalletInstrumentWrapper instrument_wrapper(instrument.get());
   const_cast<wallet::Address*>(&instrument->address())->
@@ skipping 18 matching lines @@
 
   const_cast<wallet::Address*>(&instrument->address())->
       SetPhoneNumber(international_unformatted);
   EXPECT_EQ(national_formatted,
             instrument_wrapper.GetInfoForDisplay(
                 AutofillType(PHONE_HOME_WHOLE_NUMBER)));
   EXPECT_EQ(national_formatted,
             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.
   profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, international_unformatted);
   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(
                 AutofillType(PHONE_HOME_WHOLE_NUMBER)));
   profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, national_formatted);
   EXPECT_EQ(national_formatted,
             profile_wrapper.GetInfoForDisplay(
                 AutofillType(PHONE_HOME_WHOLE_NUMBER)));
   profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, user_formatted);
   EXPECT_EQ(user_formatted,
             profile_wrapper.GetInfoForDisplay(
                 AutofillType(PHONE_HOME_WHOLE_NUMBER)));
-
 }
 
 }  // namespace autofill