Make autofill's Address store country using the country code so that app locale isn't needed for th…

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/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 999 matching lines @@
   profile1.SetRawInfo(ADDRESS_HOME_LINE1,
                       WideToUTF16(L"\uad6d\uc815\uc6d0\xb7\uac80\ucc30, "
                                   L"\ub178\ubb34\ud604\uc815\ubd80 "
                                   L"\ub300\ubd81\uc811\ucd09 \ub2f4\ub2f9 "
                                   L"\uc778\uc0ac\ub4e4 \uc870\uc0ac"));
   profile1.SetRawInfo(ADDRESS_HOME_CITY,
                       WideToUTF16(L"\u653f\u5e9c\u4e0d\u6392\u9664\u7acb\u6cd5"
                                   L"\u898f\u7ba1\u5c0e\u904a"));
   profile1.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"YOHO_54676"));
   profile1.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"861088828000"));
-  profile1.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"India"), "en-US");

[Ilya Sherman, 2013/04/05 05:18:01]

Please preserve this; it should continue to work.

[jam, 2013/04/05 06:45:54]

Done. i don't know what i was thinking when I changed that.

+  profile1.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"IN"), "en-US");
   profiles.push_back(profile1);
 
   AutofillProfile profile2;
   profile2.SetRawInfo(NAME_FIRST,
                       WideToUTF16(L"\u4e0a\u6d77\u5e02\u91d1\u5c71\u533a "
                                   L"\u677e\u9690\u9547\u4ead\u67ab\u516c"
                                   L"\u8def1915\u53f7"));
   profile2.SetRawInfo(NAME_LAST, WideToUTF16(L"aguantó"));
   profile2.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"HOME 94043"));
   profiles.push_back(profile2);
@@ skipping 46 matching lines @@
   AutofillProfile profile7;
   profile7.SetRawInfo(NAME_FIRST, WideToUTF16(L"&$%$$$ TESTO *&*&^&^& MOKO"));
   profile7.SetRawInfo(NAME_MIDDLE, WideToUTF16(L"WOHOOOO$$$$$$$$****"));
   profile7.SetRawInfo(EMAIL_ADDRESS, WideToUTF16(L"yuvu@example.com"));
   profile7.SetRawInfo(ADDRESS_HOME_LINE1,
                       WideToUTF16(L"34544, anderson ST.(120230)"));
   profile7.SetRawInfo(ADDRESS_HOME_CITY, WideToUTF16(L"Sunnyvale"));
   profile7.SetRawInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA"));
   profile7.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"94086"));
   profile7.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"15466784565"));
-  profile7.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"United States"),

[Ilya Sherman, 2013/04/05 05:18:01]

Ditto.

-                   "en-US");
+  profile7.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"US"), "en-US");
   profiles.push_back(profile7);
 
   SetProfiles(&profiles);
   ASSERT_EQ(profiles.size(), personal_data_manager()->GetProfiles().size());
   for (size_t i = 0; i < profiles.size(); ++i)
     ASSERT_EQ(profiles[i], *personal_data_manager()->GetProfiles()[i]);
 
   std::vector<CreditCard> cards;
   CreditCard card1;
   card1.SetRawInfo(CREDIT_CARD_NAME,
@@ skipping 50 matching lines @@
 // information entered into the prefs UI is not validated or rejected except for
 // duplicates.
 // TODO(isherman): rewrite as WebUI test?
 IN_PROC_BROWSER_TEST_F(AutofillTest, Invalid) {
   // First try profiles with invalid ZIP input.
   AutofillProfile without_invalid;
   without_invalid.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Will"));
   without_invalid.SetRawInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("Sunnyvale"));
   without_invalid.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
   without_invalid.SetRawInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("my_zip"));
-  without_invalid.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States"),

[Ilya Sherman, 2013/04/05 05:18:01]

Ditto.

[jam, 2013/04/05 06:45:54]

Done.

-                          "en-US");
+  without_invalid.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("US"), "en-US");
 
   AutofillProfile with_invalid = without_invalid;
   with_invalid.SetRawInfo(PHONE_HOME_WHOLE_NUMBER,
                           ASCIIToUTF16("Invalid_Phone_Number"));
   SetProfile(with_invalid);
 
   ASSERT_EQ(1u, personal_data_manager()->GetProfiles().size());
   AutofillProfile profile = *personal_data_manager()->GetProfiles()[0];
   ASSERT_NE(without_invalid.GetRawInfo(PHONE_HOME_WHOLE_NUMBER),
             profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
@@ skipping 541 matching lines @@
 // TODO(isherman): this looks redundant, consider removing.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }