[Autofill] Update unit tests to use country codes when setting raw address info.

chrome/browser/autofill/autofill_manager_unittest.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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 141 matching lines @@
     credit_card->set_guid("00000000-0000-0000-0000-000000000007");
     credit_cards_.push_back(credit_card);
   }
 
  private:
   void CreateTestAutofillProfiles(ScopedVector<AutofillProfile>* profiles) {
     AutofillProfile* profile = new AutofillProfile;
     autofill_test::SetProfileInfo(profile, "Elvis", "Aaron",
                                   "Presley", "theking@gmail.com", "RCA",
                                   "3734 Elvis Presley Blvd.", "Apt. 10",
-                                  "Memphis", "Tennessee", "38116", "USA",
+                                  "Memphis", "Tennessee", "38116", "US",
                                   "12345678901");
     profile->set_guid("00000000-0000-0000-0000-000000000001");
     profiles->push_back(profile);
     profile = new AutofillProfile;
     autofill_test::SetProfileInfo(profile, "Charles", "Hardin",
                                   "Holley", "buddy@gmail.com", "Decca",
                                   "123 Apple St.", "unit 6", "Lubbock",
-                                  "Texas", "79401", "USA", "23456789012");
+                                  "Texas", "79401", "US", "23456789012");
     profile->set_guid("00000000-0000-0000-0000-000000000002");
     profiles->push_back(profile);
     profile = new AutofillProfile;
     autofill_test::SetProfileInfo(profile, "", "", "", "", "", "", "", "", "",
                                   "", "", "");
     profile->set_guid("00000000-0000-0000-0000-000000000003");
     profiles->push_back(profile);
   }
 
   void CreateTestCreditCards(ScopedVector<CreditCard>* credit_cards) {
@@ skipping 2288 matching lines @@
 
   ASSERT_EQ(5U, results2.fields.size());
   EXPECT_EQ(ASCIIToUTF16("1"), results2.fields[0].value);
   EXPECT_EQ(ASCIIToUTF16("650"), results2.fields[1].value);
   EXPECT_EQ(ASCIIToUTF16("555"), results2.fields[2].value);
   EXPECT_EQ(ASCIIToUTF16("4567"), results2.fields[3].value);
   EXPECT_EQ(string16(), results2.fields[4].value);
 
   // We should not be able to fill prefix and suffix fields for international
   // numbers.
-  work_profile->SetRawInfo(ADDRESS_HOME_COUNTRY,
-                           ASCIIToUTF16("United Kingdom"));
+  work_profile->SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("GB"));
   work_profile->SetRawInfo(PHONE_HOME_WHOLE_NUMBER,
                            ASCIIToUTF16("447700954321"));
   page_id = 3;
   FillAutofillFormData(page_id, form_with_maxlength,
                        *form_with_maxlength.fields.begin(),
                        PackGUIDs(empty, guid));
   page_id = 0;
   FormData results3;
   EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results3));
   EXPECT_EQ(3, page_id);
@@ skipping 18 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("44"), results4.fields[0].value);
   EXPECT_EQ(ASCIIToUTF16("7700"), results4.fields[1].value);
   EXPECT_EQ(ASCIIToUTF16("954321"), results4.fields[2].value);
   EXPECT_EQ(ASCIIToUTF16("954321"), results4.fields[3].value);
   EXPECT_EQ(string16(), results4.fields[4].value);
 
   // We should fill all phone fields with the same phone number variant.
   std::vector<string16> phone_variants;
   phone_variants.push_back(ASCIIToUTF16("16505554567"));
   phone_variants.push_back(ASCIIToUTF16("18887771234"));
-  work_profile->SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States"));
+  work_profile->SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("US"));
   work_profile->SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, phone_variants);
 
   page_id = 5;
   GUIDPair variant_guid(work_profile->guid(), 1);
   FillAutofillFormData(page_id, form_with_maxlength,
                        *form_with_maxlength.fields.begin(),
                        PackGUIDs(empty, variant_guid));
   page_id = 0;
   FormData results5;
   EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results5));
@@ skipping 701 matching lines @@
 
   FormData form;
   CreateTestAddressFormData(&form);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
   const FormFieldData& field = form.fields[0];
   GetAutofillSuggestions(form, field);  // should call the delegate's OnQuery()
 
   autofill_manager_->SetExternalDelegate(NULL);
 }