Change PhoneNumber::SetInfo to only apply formatting where there is none

components/autofill/core/browser/personal_data_manager_unittest.cc

Index: components/autofill/core/browser/personal_data_manager_unittest.cc
diff --git a/components/autofill/core/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc
index bdbe43656c4d381ac51e9bcd477d9c8abcaa7b80..a498dd5e7e8506542faf4af3ede734cfe6e9b2cc 100644
--- a/components/autofill/core/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/core/browser/personal_data_manager_unittest.cc
@@ -2327,9 +2327,19 @@ TEST_F(PersonalDataManagerTest, CaseInsensitiveMultiValueAggregation) {
   base::MessageLoop::current()->Run();
 
   AutofillProfile expected(base::GenerateGUID(), "https://www.example.com");
-  test::SetProfileInfo(&expected, "George", NULL,
-      "Washington", "theprez@gmail.com", NULL, "21 Laussat St", NULL,
-      "San Francisco", "California", "94102", NULL, "(817) 555-6789");
+  test::SetProfileInfo(&expected,
+                       "George",
+                       NULL,
+                       "Washington",
+                       "theprez@gmail.com",
+                       NULL,
+                       "21 Laussat St",
+                       NULL,
+                       "San Francisco",
+                       "California",
+                       "94102",
+                       NULL,
+                       "817-555-6789");
   const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
   ASSERT_EQ(1U, results1.size());
   EXPECT_EQ(0, expected.Compare(*results1[0]));
@@ -2374,7 +2384,7 @@ TEST_F(PersonalDataManagerTest, CaseInsensitiveMultiValueAggregation) {
   // Modify expected to include multi-valued fields.
   std::vector<base::string16> values;
   expected.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
-  values.push_back(ASCIIToUTF16("(214) 555-1234"));
+  values.push_back(ASCIIToUTF16("214-555-1234"));
   expected.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);
 
   ASSERT_EQ(1U, results2.size());