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

chrome/browser/autofill/autofill_browsertest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 603 matching lines @@
   data4["ADDRESS_HOME_STATE"] = "CA";
   data4["ADDRESS_HOME_ZIP"] = "95510";
   data4["ADDRESS_HOME_COUNTRY"] = "Germany";
   data4["PHONE_HOME_WHOLE_NUMBER"] = "+21 08450 777 777";
   profiles.push_back(data4);
 
   for (size_t i = 0; i < profiles.size(); ++i)
     FillFormAndSubmit("autofill_test_form.html", profiles[i]);
 
   ASSERT_EQ(2u, personal_data_manager()->GetProfiles().size());
-  ASSERT_EQ(ASCIIToUTF16("(408) 871-4567"),
+  ASSERT_EQ(ASCIIToUTF16("408-871-4567"),
             personal_data_manager()->GetProfiles()[0]->GetRawInfo(
                 PHONE_HOME_WHOLE_NUMBER));
-  ASSERT_EQ(ASCIIToUTF16("+49 40 808179000"),
+  ASSERT_EQ(ASCIIToUTF16("+49 40-80-81-79-000"),
             personal_data_manager()->GetProfiles()[1]->GetRawInfo(
                 PHONE_HOME_WHOLE_NUMBER));
 }
 
-// Test Autofill appends country codes to aggregated phone numbers.
-// The country code is added for the following case:
-//   The phone number contains the correct national number size and
-//   is a valid format.
+// Prepend country codes when formatting phone numbers, but only if the user
+// provided one in the first place.
 IN_PROC_BROWSER_TEST_F(AutofillTest, AppendCountryCodeForAggregatedPhones) {
   ASSERT_TRUE(test_server()->Start());
   FormMap data;
   data["NAME_FIRST"] = "Bob";
   data["NAME_LAST"] = "Smith";
   data["ADDRESS_HOME_LINE1"] = "1234 H St.";
   data["ADDRESS_HOME_CITY"] = "San Jose";
   data["ADDRESS_HOME_STATE"] = "CA";
   data["ADDRESS_HOME_ZIP"] = "95110";
   data["ADDRESS_HOME_COUNTRY"] = "Germany";
-  data["PHONE_HOME_WHOLE_NUMBER"] = "(08) 450 777-777";
+  data["PHONE_HOME_WHOLE_NUMBER"] = "+4908450777777";
   FillFormAndSubmit("autofill_test_form.html", data);
 
-  ASSERT_EQ(1u, personal_data_manager()->GetProfiles().size());
-  base::string16 phone = personal_data_manager()->GetProfiles()[0]->GetRawInfo(
-      PHONE_HOME_WHOLE_NUMBER);
-  ASSERT_TRUE(StartsWith(phone, ASCIIToUTF16("+49"), true));
+  data["ADDRESS_HOME_LINE1"] = "4321 H St.";
+  data["PHONE_HOME_WHOLE_NUMBER"] = "08450777777";
+  FillFormAndSubmit("autofill_test_form.html", data);
+
+  ASSERT_EQ(2u, personal_data_manager()->GetProfiles().size());
+  EXPECT_EQ(ASCIIToUTF16("+49 8450 777777"),
+            personal_data_manager()->GetProfiles()[0]->GetRawInfo(
+                PHONE_HOME_WHOLE_NUMBER));
+
+  FillFormAndSubmit("autofill_test_form.html", data);
+  EXPECT_EQ(ASCIIToUTF16("08450 777777"),
+            personal_data_manager()->GetProfiles()[1]->GetRawInfo(
+                PHONE_HOME_WHOLE_NUMBER));
 }
 
 // Test CC info not offered to be saved when autocomplete=off for CC field.
 // If the credit card number field has autocomplete turned off, then the credit
 // card infobar should not offer to save the credit card info. The credit card
 // number must be a valid Luhn number.
 IN_PROC_BROWSER_TEST_F(AutofillTest, CCInfoNotStoredWhenAutocompleteOff) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
@@ skipping 62 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_duplicated_profiles.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }
 
 }  // namespace autofill