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

components/autofill/browser/autofill_profile_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 "base/basictypes.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
@@ skipping 571 matching lines @@
   // Phone numbers are compared by the full number, including the area code.
   // This is a regression test for http://crbug.com/163024
   autofill_test::SetProfileInfo(&a, NULL, NULL, NULL, NULL,
       NULL, NULL, NULL, NULL, NULL, NULL, NULL, "650.555.4321");
   autofill_test::SetProfileInfo(&b, NULL, NULL, NULL, NULL,
       NULL, NULL, NULL, NULL, NULL, NULL, NULL, "408.555.4321");
   EXPECT_GT(0, a.Compare(b));
   EXPECT_LT(0, b.Compare(a));
 }
 
-TEST(AutofillProfileTest, CountryCode) {
-  AutofillProfile profile;
-  EXPECT_EQ(std::string(), profile.CountryCode());
-
-  profile.SetCountryCode("US");
-  EXPECT_EQ("US", profile.CountryCode());
-}
-
 TEST(AutofillProfileTest, MultiValueNames) {
   AutofillProfile p;
   const string16 kJohnDoe(ASCIIToUTF16("John Doe"));
   const string16 kJohnPDoe(ASCIIToUTF16("John P. Doe"));
   std::vector<string16> set_values;
   set_values.push_back(kJohnDoe);
   set_values.push_back(kJohnPDoe);
   p.SetRawMultiInfo(NAME_FULL, set_values);
 
   // Expect regular |GetInfo| returns the first element.
@@ skipping 123 matching lines @@
   }
 
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = options;
   field.option_contents = options;
 
   AutofillProfile profile;
   profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("CA"));
   profile.FillSelectControl(ADDRESS_HOME_COUNTRY, &field);
-  EXPECT_EQ(ASCIIToUTF16("Canada"), field.value);
+  EXPECT_EQ(ASCIIToUTF16("CA"), field.value);

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

This should remain "Canada".  "CA" isn't actually one of the elements in the
<select> dropdown.

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

Done.

 }
 
 TEST(AutofillProfileTest, AddressCountryAbbrev) {
   const char* const kCountries[] = {
     "AL", "CA"
   };
   std::vector<string16> options(arraysize(kCountries));
   for (size_t i = 0; i < arraysize(kCountries); ++i) {
     options[i] = ASCIIToUTF16(kCountries[i]);
   }
 
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = options;
   field.option_contents = options;
 
   AutofillProfile profile;
-  profile.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Canada"), "en-US");
+  profile.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("CA"), "en-US");

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

nit: Might as well use SetRawInfo now.

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

Done.

   profile.FillSelectControl(ADDRESS_HOME_COUNTRY, &field);
   EXPECT_EQ(ASCIIToUTF16("CA"), field.value);
 }
 
 TEST(AutofillProfileTest, AddressStateFull) {
   const char* const kStates[] = {
     "Alabama", "California"
   };
   std::vector<string16> options(arraysize(kStates));
   for (size_t i = 0; i < arraysize(kStates); ++i) {
@@ skipping 67 matching lines @@
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = values;
   field.option_contents = contents;
 
   AutofillProfile profile;
   profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("California"));
   profile.FillSelectControl(ADDRESS_HOME_STATE, &field);
   EXPECT_EQ(ASCIIToUTF16("2"), field.value);
 }