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

components/autofill/core/browser/phone_number_unittest.cc

Index: components/autofill/core/browser/phone_number_unittest.cc
diff --git a/components/autofill/core/browser/phone_number_unittest.cc b/components/autofill/core/browser/phone_number_unittest.cc
index 29b1694803b9739ae4306a9f6d732911544fcdc8..b858768eb87a264a091c18dd4c53176572f3535e 100644
--- a/components/autofill/core/browser/phone_number_unittest.cc
+++ b/components/autofill/core/browser/phone_number_unittest.cc
@@ -104,11 +104,21 @@ TEST(PhoneNumberTest, SetInfo) {
                             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"),
+            phone.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
 
-  // Differently formatted numbers should be re-formatted.
+  // 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"),
+  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"));
+  EXPECT_EQ(ASCIIToUTF16("8004328765"),
             phone.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
 
   // Invalid numbers should not be stored.  In the US, phone numbers cannot