Adjust autofill phone number format.

components/autofill/core/browser/phone_number_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/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/phone_number.h"
@@ skipping 89 matching lines @@
             phone.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
 
   // Unformatted numbers should be formatted.
   EXPECT_TRUE(phone.SetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER),
                             ASCIIToUTF16("8887776666"), "US"));
   EXPECT_EQ(ASCIIToUTF16("(888) 777-6666"),
             phone.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
   EXPECT_TRUE(phone.SetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER),
                             ASCIIToUTF16("+18887776666"),
                             "US"));
-  EXPECT_EQ(ASCIIToUTF16("+1 888-777-6666"),
+  EXPECT_EQ(ASCIIToUTF16("1 888-777-6666"),
             phone.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
 
   // Differently formatted numbers should be left alone.
   EXPECT_TRUE(phone.SetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER),
                             ASCIIToUTF16("800-432-8765"), "US"));
   EXPECT_EQ(ASCIIToUTF16("800-432-8765"),
             phone.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
 
   // SetRawInfo should not try to format.
   phone.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("8004328765"));
@@ skipping 45 matching lines @@
                                ASCIIToUTF16("1")));
   EXPECT_TRUE(number1.SetInfo(AutofillType(PHONE_HOME_COUNTRY_CODE),
                               ASCIIToUTF16("1")));
   EXPECT_TRUE(number1.SetInfo(AutofillType(PHONE_HOME_CITY_CODE),
                               ASCIIToUTF16("650")));
   EXPECT_TRUE(number1.SetInfo(AutofillType(PHONE_HOME_NUMBER),
                               ASCIIToUTF16("2345678")));
   base::string16 parsed_phone;
   EXPECT_TRUE(number1.ParseNumber(profile, "en-US", &parsed_phone));
   // International format as it has a country code.
-  EXPECT_EQ(ASCIIToUTF16("+1 650-234-5678"), parsed_phone);
+  EXPECT_EQ(ASCIIToUTF16("1 650-234-5678"), parsed_phone);
 
   PhoneNumber::PhoneCombineHelper number3;
   EXPECT_TRUE(number3.SetInfo(AutofillType(PHONE_HOME_CITY_CODE),
                               ASCIIToUTF16("650")));
   EXPECT_TRUE(number3.SetInfo(AutofillType(PHONE_HOME_NUMBER),
                               ASCIIToUTF16("2345680")));
   EXPECT_TRUE(number3.ParseNumber(profile, "en-US", &parsed_phone));
   // National format as it does not have a country code.
   EXPECT_EQ(ASCIIToUTF16("(650) 234-5680"), parsed_phone);
 
@@ skipping 28 matching lines @@
                               ASCIIToUTF16("650")));
   EXPECT_TRUE(number7.SetInfo(AutofillType(PHONE_HOME_NUMBER),
                               ASCIIToUTF16("234")));
   EXPECT_TRUE(number7.SetInfo(AutofillType(PHONE_HOME_NUMBER),
                               ASCIIToUTF16("5682")));
   EXPECT_TRUE(number7.ParseNumber(AutofillProfile(), "en-US", &parsed_phone));
   EXPECT_EQ(ASCIIToUTF16("(650) 234-5682"), parsed_phone);
 }
 
 }  // namespace autofill