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 242 matching lines @@
 
   PersonalDataManager* personal_data_manager() {
     return PersonalDataManagerFactory::GetForProfile(browser()->profile());
   }
 
   void CreateTestProfile() {
     AutofillProfile profile;
     autofill_test::SetProfileInfo(
         &profile, "Milton", "C.", "Waddams",
         "red.swingline@initech.com", "Initech", "4120 Freidrich Lane",
-        "Basement", "Austin", "Texas", "78744", "United States", "5125551234");
+        "Basement", "Austin", "Texas", "78744", "US", "5125551234");
 
     WindowedPersonalDataManagerObserver observer(browser());
     personal_data_manager()->AddProfile(profile);
 
     // AddProfile is asynchronous. Wait for it to finish before continuing the
     // tests.
     observer.Wait();
   }
 
   void SetProfiles(std::vector<AutofillProfile>* profiles) {
@@ skipping 1438 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()));
 }