Adjust autofill phone number format.

components/autofill/core/browser/phone_number_i18n_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/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libphonenumber/src/phonenumber_api.h"
@@ skipping 131 matching lines @@
   }
 }
 
 TEST(PhoneNumberI18NTest, ConstructPhoneNumber) {
   base::string16 number;
   EXPECT_TRUE(ConstructPhoneNumber(ASCIIToUTF16("1"),
                                    ASCIIToUTF16("650"),
                                    ASCIIToUTF16("2345678"),
                                    "US",
                                    &number));
-  EXPECT_EQ(number, ASCIIToUTF16("+1 650-234-5678"));
+  EXPECT_EQ(number, ASCIIToUTF16("1 650-234-5678"));

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

these expectations are backwards (expected value goes in front)

   EXPECT_TRUE(ConstructPhoneNumber(base::string16(),
                                    ASCIIToUTF16("650"),
                                    ASCIIToUTF16("2345678"),
                                    "US",
                                    &number));
   EXPECT_EQ(number, ASCIIToUTF16("(650) 234-5678"));
   EXPECT_TRUE(ConstructPhoneNumber(ASCIIToUTF16("1"),
                                    base::string16(),
                                    ASCIIToUTF16("6502345678"),
                                    "US",
                                    &number));
-  EXPECT_EQ(number, ASCIIToUTF16("+1 650-234-5678"));
+  EXPECT_EQ(number, ASCIIToUTF16("1 650-234-5678"));
   EXPECT_TRUE(ConstructPhoneNumber(base::string16(),
                                    base::string16(),
                                    ASCIIToUTF16("6502345678"),
                                    "US",
                                    &number));
   EXPECT_EQ(number, ASCIIToUTF16("(650) 234-5678"));
 
   EXPECT_FALSE(ConstructPhoneNumber(base::string16(),
                                     ASCIIToUTF16("650"),
                                     ASCIIToUTF16("234567890"),
@@ skipping 75 matching lines @@
                                  "en-US"));
 
   // Different numbers don't match.
   EXPECT_FALSE(PhoneNumbersMatch(ASCIIToUTF16("14158889999"),
                                  ASCIIToUTF16("1415888"),
                                  "US",
                                  "en-US"));
 }
 
 }  // namespace autofill