These changes *are* for review :)

chrome/browser/autofill/autofill_profile_unittest.cc

 // Copyright (c) 2011 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/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ skipping 21 matching lines @@
   // Empty profile - nothing to update.
   EXPECT_FALSE(UpdateProfileLabel(&profile0));
   string16 summary0 = profile0.Label();
   EXPECT_EQ(string16(), summary0);
 
   // Case 0a/empty name and address, so the first two fields of the rest of the
   // data is used: "Hollywood, CA"
   AutofillProfile profile00;
   autofill_test::SetProfileInfo(&profile00, "", "Mitchell", "",
       "johnwayne@me.xyz", "Fox", "", "unit 5", "Hollywood", "CA", "91601", "US",
-      "12345678910", "01987654321");
+      "16505678910", "78127654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile00));
   string16 summary00 = profile00.Label();
   EXPECT_EQ(ASCIIToUTF16("Hollywood, CA"), summary00);
 
   // Case 1: "<address>"
   AutofillProfile profile1;
   autofill_test::SetProfileInfo(&profile1, "", "Mitchell", "",
       "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5", "Hollywood", "CA",
-      "91601", "US", "12345678910", "01987654321");
+      "91601", "US", "16505678910", "78127654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile1));
   string16 summary1 = profile1.Label();
   EXPECT_EQ(ASCIIToUTF16("123 Zoo St., Hollywood"), summary1);
 
   // Case 2: "<lastname>"
   AutofillProfile profile2;
   autofill_test::SetProfileInfo(&profile2, "", "Mitchell",
       "Morrison", "johnwayne@me.xyz", "Fox", "", "unit 5", "Hollywood", "CA",
-      "91601", "US", "12345678910", "01987654321");
+      "91601", "US", "16505678910", "78127654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile2));
   string16 summary2 = profile2.Label();
   // Summary does include full name which is empty if the first name is empty.
   EXPECT_EQ(ASCIIToUTF16("Hollywood, CA"), summary2);
 
   // Case 3: "<lastname>, <address>"
   AutofillProfile profile3;
   autofill_test::SetProfileInfo(&profile3, "", "Mitchell",
       "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5",
-      "Hollywood", "CA", "91601", "US", "12345678910", "01987654321");
+      "Hollywood", "CA", "91601", "US", "16505678910", "78127654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile3));
   string16 summary3 = profile3.Label();
   EXPECT_EQ(ASCIIToUTF16("123 Zoo St., Hollywood"), summary3);
 
   // Case 4: "<firstname>"
   AutofillProfile profile4;
   autofill_test::SetProfileInfo(&profile4, "Marion", "Mitchell", "",
       "johnwayne@me.xyz", "Fox", "", "unit 5", "Hollywood", "CA", "91601", "US",
-      "12345678910", "01987654321");
+      "16505678910", "01987654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile4));
   string16 summary4 = profile4.Label();
   EXPECT_EQ(ASCIIToUTF16("Marion Mitchell, Hollywood"), summary4);
 
   // Case 5: "<firstname>, <address>"
   AutofillProfile profile5;
   autofill_test::SetProfileInfo(&profile5, "Marion", "Mitchell", "",
       "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5", "Hollywood", "CA",
-      "91601", "US", "12345678910", "01987654321");
+      "91601", "US", "16505678910", "78127654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile5));
   string16 summary5 = profile5.Label();
   EXPECT_EQ(ASCIIToUTF16("Marion Mitchell, 123 Zoo St."), summary5);
 
   // Case 6: "<firstname> <lastname>"
   AutofillProfile profile6;
   autofill_test::SetProfileInfo(&profile6, "Marion", "Mitchell",
       "Morrison", "johnwayne@me.xyz", "Fox", "", "unit 5", "Hollywood", "CA",
-      "91601", "US", "12345678910", "01987654321");
+      "91601", "US", "16505678910", "78127654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile6));
   string16 summary6 = profile6.Label();
   EXPECT_EQ(ASCIIToUTF16("Marion Mitchell Morrison, Hollywood"),
             summary6);
 
   // Case 7: "<firstname> <lastname>, <address>"
   AutofillProfile profile7;
   autofill_test::SetProfileInfo(&profile7, "Marion", "Mitchell",
       "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5",
-      "Hollywood", "CA", "91601", "US", "12345678910", "01987654321");
+      "Hollywood", "CA", "91601", "US", "16505678910", "78127654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile7));
   string16 summary7 = profile7.Label();
   EXPECT_EQ(ASCIIToUTF16("Marion Mitchell Morrison, 123 Zoo St."),
             summary7);
 
   // Case 7a: "<firstname> <lastname>, <address>" - same as #7, except for
   // e-mail.
   AutofillProfile profile7a;
   autofill_test::SetProfileInfo(&profile7a, "Marion", "Mitchell",
     "Morrison", "marion@me.xyz", "Fox", "123 Zoo St.", "unit 5",
-    "Hollywood", "CA", "91601", "US", "12345678910", "01987654321");
+    "Hollywood", "CA", "91601", "US", "16505678910", "78127654321");
   std::vector<AutofillProfile*> profiles;
   profiles.push_back(&profile7);
   profiles.push_back(&profile7a);
   EXPECT_TRUE(AutofillProfile::AdjustInferredLabels(&profiles));
   summary7 = profile7.Label();
   string16 summary7a = profile7a.Label();
   EXPECT_EQ(ASCIIToUTF16(
       "Marion Mitchell Morrison, 123 Zoo St., johnwayne@me.xyz"), summary7);
   EXPECT_EQ(ASCIIToUTF16(
       "Marion Mitchell Morrison, 123 Zoo St., marion@me.xyz"), summary7a);
 }
 
 TEST(AutofillProfileTest, AdjustInferredLabels) {
   std::vector<AutofillProfile*> profiles;
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(
       profiles[0],
       "John",
       "",
       "Doe",
       "johndoe@hades.com",
       "Underworld",
       "666 Erebus St.",
       "",
       "Elysium", "CA",
       "91111",
       "US",
-      "11111111111",
-      "22222222222");
+      "16502111111",
+      "16502222222");
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(
       profiles[1],
       "Jane",
       "",
       "Doe",
       "janedoe@tertium.com",
       "Pluto Inc.",
       "123 Letha Shore.",
       "",
@@ skipping 17 matching lines @@
       "John",
       "",
       "Doe",
       "johndoe@tertium.com",
       "Underworld",
       "666 Erebus St.",
       "",
       "Elysium", "CA",
       "91111",
       "US",
-      "11111111111",
-      "22222222222");
+      "16502111111",
+      "16502222222");
   EXPECT_TRUE(AutofillProfile::AdjustInferredLabels(&profiles));
 
   // Profile 0 and 2 inferred label now includes an e-mail.
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@hades.com"),
             profiles[0]->Label());
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."),
             profiles[1]->Label());
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@tertium.com"),
             profiles[2]->Label());
 
   delete profiles[2];
   profiles.pop_back();
 
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(
       profiles[2],
       "John",
       "",
       "Doe",
       "johndoe@hades.com",
       "Underworld",
       "666 Erebus St.",
       "",
       "Elysium", "CA",
       "91111",
       "US",
-      "11111111111",
-      "33333333333");  // Fax is different
+      "16502111111",
+      "16503333333");  // Fax is different
 
   EXPECT_TRUE(AutofillProfile::AdjustInferredLabels(&profiles));
 
   // Profile 0 and 2 inferred label now includes a fax number.
-  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., fax:#22222222222"),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., fax:#16502222222"),
             profiles[0]->Label());
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."),
             profiles[1]->Label());
-  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., fax:#33333333333"),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., fax:#16503333333"),
             profiles[2]->Label());
 
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(
       profiles[3],
       "John",
       "",
       "Doe",
       "johndoe@hades.com",
       "Underworld",
       "666 Erebus St.",
       "",
       "Elysium", "CA",
       "91111",
       "US",
-      "44444444444",  // Phone is different for some.
-      "33333333333");  // Fax is different for some.
+      "16504444444",  // Phone is different for some.
+      "16503333333");  // Fax is different for some.
 
   EXPECT_TRUE(AutofillProfile::AdjustInferredLabels(&profiles));
 
-  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., 11111111111,"
-                         " fax:#22222222222"),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., 16502111111,"
+                         " fax:#16502222222"),
             profiles[0]->Label());
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."),
             profiles[1]->Label());
-  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., 11111111111,"
-                         " fax:#33333333333"),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., 16502111111,"
+                         " fax:#16503333333"),
             profiles[2]->Label());
   // This one differs from other ones by unique phone, so no need for extra
   // information.
-  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., 44444444444"),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., 16504444444"),
             profiles[3]->Label());
 
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(
       profiles[4],
       "John",
       "",
       "Doe",
       "johndoe@styx.com",  // E-Mail is different for some.
       "Underworld",
       "666 Erebus St.",
       "",
       "Elysium", "CA",
       "91111",
       "US",
-      "44444444444",  // Phone is different for some.
-      "33333333333");  // Fax is different for some.
+      "16504444444",  // Phone is different for some.
+      "16503333333");  // Fax is different for some.
 
   EXPECT_TRUE(AutofillProfile::AdjustInferredLabels(&profiles));
 
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@hades.com,"
-                         " 11111111111, fax:#22222222222"),
+                         " 16502111111, fax:#16502222222"),
             profiles[0]->Label());
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."),
             profiles[1]->Label());
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@hades.com,"
-                         " 11111111111, fax:#33333333333"),
+                         " 16502111111, fax:#16503333333"),
             profiles[2]->Label());
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@hades.com,"
-                         " 44444444444, fax:#33333333333"),
+                         " 16504444444, fax:#16503333333"),
             profiles[3]->Label());
   // This one differs from other ones by unique e-mail, so no need for extra
   // information.
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@styx.com"),
             profiles[4]->Label());
 
   EXPECT_FALSE(AutofillProfile::AdjustInferredLabels(&profiles));
 
   // Clean up.
   STLDeleteContainerPointers(profiles.begin(), profiles.end());
 }
 
 TEST(AutofillProfileTest, CreateInferredLabels) {
   std::vector<AutofillProfile*> profiles;
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(profiles[0],
                                 "John",
                                 "",
                                 "Doe",
                                 "johndoe@hades.com",
                                 "Underworld",
                                 "666 Erebus St.",
                                 "",
                                 "Elysium", "CA",
                                 "91111",
                                 "US",
-                                "11111111111",
-                                "22222222222");
+                                "16502111111",
+                                "16502222222");
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(profiles[1],
                                 "Jane",
                                 "",
                                 "Doe",
                                 "janedoe@tertium.com",
                                 "Pluto Inc.",
                                 "123 Letha Shore.",
                                 "",
                                 "Dis", "CA",
@@ skipping 424 matching lines @@
   std::vector<string16> get_values;
   p.GetMultiInfo(PHONE_HOME_WHOLE_NUMBER, &get_values);
   ASSERT_EQ(2UL, get_values.size());
   EXPECT_EQ(kJohnDoe, get_values[0]);
   EXPECT_EQ(kJohnPDoe, get_values[1]);
 
   // Update the values.
   AutofillProfile p2 = p;
   EXPECT_EQ(0, p.Compare(p2));
   EXPECT_EQ(0, p.CompareMulti(p2));
-  const string16 kNoOne(ASCIIToUTF16("4151110000"));
+  const string16 kNoOne(ASCIIToUTF16("4152110000"));
   set_values[1] = kNoOne;
   p.SetMultiInfo(PHONE_HOME_WHOLE_NUMBER, set_values);
   p.GetMultiInfo(PHONE_HOME_WHOLE_NUMBER, &get_values);
   ASSERT_EQ(2UL, get_values.size());
   EXPECT_EQ(kJohnDoe, get_values[0]);
   EXPECT_EQ(kNoOne, get_values[1]);
   EXPECT_EQ(0, p.Compare(p2));
   EXPECT_NE(0, p.CompareMulti(p2));
 
   // Delete values.
   set_values.clear();
   p.SetMultiInfo(PHONE_HOME_WHOLE_NUMBER, set_values);
   p.GetMultiInfo(PHONE_HOME_WHOLE_NUMBER, &get_values);
   ASSERT_EQ(1UL, get_values.size());
   EXPECT_EQ(string16(), get_values[0]);
 
   // Expect regular |GetInfo| returns empty value.
   EXPECT_EQ(string16(), p.GetInfo(PHONE_HOME_WHOLE_NUMBER));
 }
 
 TEST(AutofillProfileTest, MultiValueFax) {
   AutofillProfile p;
-  const string16 kJohnDoe(ASCIIToUTF16("4151112222"));
-  const string16 kJohnPDoe(ASCIIToUTF16("4151113333"));
+  const string16 kJohnDoe(ASCIIToUTF16("4152112222"));
+  const string16 kJohnPDoe(ASCIIToUTF16("4153113333"));
   std::vector<string16> set_values;
   set_values.push_back(kJohnDoe);
   set_values.push_back(kJohnPDoe);
   p.SetMultiInfo(PHONE_FAX_WHOLE_NUMBER, set_values);
 
   // Expect regular |GetInfo| returns the first element.
   EXPECT_EQ(kJohnDoe, p.GetInfo(PHONE_FAX_WHOLE_NUMBER));
 
   // Ensure that we get out what we put in.
   std::vector<string16> get_values;
@@ skipping 19 matching lines @@
   // Delete values.
   set_values.clear();
   p.SetMultiInfo(PHONE_FAX_WHOLE_NUMBER, set_values);
   p.GetMultiInfo(PHONE_FAX_WHOLE_NUMBER, &get_values);
   ASSERT_EQ(1UL, get_values.size());
   EXPECT_EQ(string16(), get_values[0]);
 
   // Expect regular |GetInfo| returns empty value.
   EXPECT_EQ(string16(), p.GetInfo(PHONE_FAX_WHOLE_NUMBER));
 }