These changes *are* for review :)

chrome/browser/autofill/autofill_ie_toolbar_import_win_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 "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/win/registry.h"
 #include "chrome/browser/autofill/autofill_profile.h"
@@ skipping 26 matching lines @@
   wchar_t const* const value;
 };
 
 ValueDescription profile1[] = {
   { L"name_first", L"John" },
   { L"name_middle", L"Herman" },
   { L"name_last", L"Doe" },
   { L"email", L"jdoe@test.com" },
   { L"company_name", L"Testcompany" },
   { L"phone_home_number", L"555-5555" },
-  { L"phone_home_city_code", L"444" },
+  { L"phone_home_city_code", L"650" },
   { L"phone_home_country_code", L"1" },
 };
 
 ValueDescription profile2[] = {
   { L"name_first", L"Jane" },
   { L"name_last", L"Doe" },
   { L"email", L"janedoe@test.com" },
   { L"company_name", L"Testcompany" },
   { L"phone_fax_number", L"555-6666" },
-  { L"phone_fax_city_code", L"777" },
-  { L"phone_fax_country_code", L"2" },
+  { L"phone_fax_city_code", L"812" },
+  { L"phone_fax_country_code", L"7" },
 };
 
 ValueDescription credit_card[] = {
   { L"credit_card_name", L"Tommy Gun" },
   // "4111111111111111" encrypted:
   { L"credit_card_number", L"\xE53F\x19AB\xC1BF\xC9EB\xECCC\x9BDA\x8515"
                            L"\xE14D\x6852\x80A8\x50A3\x4375\xFD9F\x1E07"
                            L"\x790E\x7336\xB773\xAF33\x93EA\xB846\xEC89"
                            L"\x265C\xD0E6\x4E23\xB75F\x7983" },
   { L"credit_card_exp_month", L"11" },
@@ skipping 95 matching lines @@
   ASSERT_EQ(profiles.size(), 2);
   // The profiles are read in reverse order.
   EXPECT_EQ(profiles[1].GetInfo(NAME_FIRST), profile1[0].value);
   EXPECT_EQ(profiles[1].GetInfo(NAME_MIDDLE), profile1[1].value);
   EXPECT_EQ(profiles[1].GetInfo(NAME_LAST), profile1[2].value);
   EXPECT_EQ(profiles[1].GetInfo(EMAIL_ADDRESS), profile1[3].value);
   EXPECT_EQ(profiles[1].GetInfo(COMPANY_NAME), profile1[4].value);
   EXPECT_EQ(profiles[1].GetInfo(PHONE_HOME_COUNTRY_CODE), profile1[7].value);
   EXPECT_EQ(profiles[1].GetInfo(PHONE_HOME_CITY_CODE), profile1[6].value);
   EXPECT_EQ(profiles[1].GetInfo(PHONE_HOME_NUMBER), L"5555555");
-  EXPECT_EQ(profiles[1].GetInfo(PHONE_HOME_WHOLE_NUMBER), L"14445555555");
+  EXPECT_EQ(profiles[1].GetInfo(PHONE_HOME_WHOLE_NUMBER), L"+16505555555");
 
   EXPECT_EQ(profiles[0].GetInfo(NAME_FIRST), profile2[0].value);
   EXPECT_EQ(profiles[0].GetInfo(NAME_LAST), profile2[1].value);
   EXPECT_EQ(profiles[0].GetInfo(EMAIL_ADDRESS), profile2[2].value);
   EXPECT_EQ(profiles[0].GetInfo(COMPANY_NAME), profile2[3].value);
   EXPECT_EQ(profiles[0].GetInfo(PHONE_FAX_COUNTRY_CODE), profile2[6].value);
   EXPECT_EQ(profiles[0].GetInfo(PHONE_FAX_CITY_CODE), profile2[5].value);
   EXPECT_EQ(profiles[0].GetInfo(PHONE_FAX_NUMBER), L"5556666");
-  EXPECT_EQ(profiles[0].GetInfo(PHONE_FAX_WHOLE_NUMBER), L"27775556666");
+  EXPECT_EQ(profiles[0].GetInfo(PHONE_FAX_WHOLE_NUMBER), L"+78125556666");
 
   ASSERT_EQ(credit_cards.size(), 1);
   EXPECT_EQ(credit_cards[0].GetInfo(CREDIT_CARD_NAME), credit_card[0].value);
   EXPECT_EQ(credit_cards[0].GetInfo(CREDIT_CARD_NUMBER), L"4111111111111111");
   EXPECT_EQ(credit_cards[0].GetInfo(CREDIT_CARD_EXP_MONTH),
             credit_card[2].value);
   EXPECT_EQ(credit_cards[0].GetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR),
             credit_card[3].value);
 
   // Mock password encrypted cc.
   cc_key.Open(HKEY_CURRENT_USER, kCreditCardKey, KEY_ALL_ACCESS);
   EXPECT_TRUE(cc_key.Valid());
   EncryptAndWrite(&cc_key, &protected_password);
   EncryptAndWrite(&cc_key, &protected_salt);
   cc_key.Close();
 
   profiles.clear();
   credit_cards.clear();
   EXPECT_TRUE(ImportCurrentUserProfiles(&profiles, &credit_cards));
   // Profiles are not protected.
   EXPECT_EQ(profiles.size(), 2);
   // Credit cards are.
   EXPECT_EQ(credit_cards.size(), 0);
 }