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

chrome/browser/autofill/personal_data_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 <string>
 
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 93 matching lines @@
   content::NotificationRegistrar registrar_;
   content::MockNotificationObserver observer_;
   PersonalDataLoadedObserverMock personal_data_observer_;
 };
 
 TEST_F(PersonalDataManagerTest, AddProfile) {
   AutofillProfile profile0;
   autofill_test::SetProfileInfo(&profile0,
       "John", "Mitchell", "Smith",
       "j@s.com", "Acme Inc.", "1 Main", "Apt A", "San Francisco", "CA",
-      "94102", "USA", "4158889999");
+      "94102", "US", "4158889999");
 
   // Add profile0 to the database.
   personal_data_->AddProfile(profile0);
 
   // Reload the database.
   ResetPersonalDataManager();
 
   // Verify the addition.
   const std::vector<AutofillProfile*>& results1 = personal_data_->GetProfiles();
   ASSERT_EQ(1U, results1.size());
@@ skipping 849 matching lines @@
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   MessageLoop::current()->Run();
 
   const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
 
   // Add multi-valued phone number to expectation.  Also, country gets added.
   std::vector<string16> values;
   expected.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
   values.push_back(ASCIIToUTF16("(650) 223-1234"));
   expected.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);
-  expected.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States"));
+  expected.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("US"));
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected.Compare(*results2[0]));
 }
 
 TEST_F(PersonalDataManagerTest, AggregateProfileWithMissingInfoInOld) {
   FormData form1;
   FormFieldData field;
   autofill_test::CreateTestFormField(
       "First name:", "first_name", "George", "text", &field);
   form1.fields.push_back(field);
@@ skipping 206 matching lines @@
   ASSERT_EQ(0U, credit_cards.size());
 }
 
 TEST_F(PersonalDataManagerTest, AggregateExistingAuxiliaryProfile) {
   // Simulate having access to an auxiliary profile.
   // |auxiliary_profile| will be owned by |personal_data_|.
   AutofillProfile* auxiliary_profile = new AutofillProfile;
   autofill_test::SetProfileInfo(auxiliary_profile,
       "Tester", "Frederick", "McAddressBookTesterson",
       "tester@example.com", "Acme Inc.", "1 Main", "Apt A", "San Francisco",
-      "CA", "94102", "USA", "1.415.888.9999");
+      "CA", "94102", "US", "1.415.888.9999");
   ScopedVector<AutofillProfile>& auxiliary_profiles =
       personal_data_->auxiliary_profiles_;
   auxiliary_profiles.push_back(auxiliary_profile);
 
   // Simulate a form submission with a subset of the info.
   // Note that the phone number format is different from the saved format.
   FormData form;
   FormFieldData field;
   autofill_test::CreateTestFormField(
       "First name:", "first_name", "Tester", "text", &field);
@@ skipping 743 matching lines @@
 
   // Modify expected to include multi-valued fields.
   std::vector<string16> values;
   expected.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
   values.push_back(ASCIIToUTF16("(214) 555-1234"));
   expected.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);
 
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected.Compare(*results2[0]));
 }