Remove application locale cache in autofill code.

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 494 matching lines @@
 
   // |a| is a subset of |b|.
   a.reset(new AutofillProfile);
   b.reset(new AutofillProfile);
   autofill_test::SetProfileInfo(a.get(), "Thomas", NULL, "Jefferson",
       "declaration_guy@gmail.com", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       NULL);
   autofill_test::SetProfileInfo(b.get(), "Thomas", NULL, "Jefferson",
       "declaration_guy@gmail.com", "United States Government", "Monticello",
       NULL, "Charlottesville", "Virginia", "22902", NULL, NULL);
-  EXPECT_TRUE(a->IsSubsetOf(*b));
+  EXPECT_TRUE(a->IsSubsetOf(*b, "en-US"));
 
   // |b| is not a subset of |a|.
-  EXPECT_FALSE(b->IsSubsetOf(*a));
+  EXPECT_FALSE(b->IsSubsetOf(*a, "en-US"));
 
   // |a| is a subset of |a|.
-  EXPECT_TRUE(a->IsSubsetOf(*a));
+  EXPECT_TRUE(a->IsSubsetOf(*a, "en-US"));
 
   // One field in |b| is different.
   a.reset(new AutofillProfile);
   b.reset(new AutofillProfile);
   autofill_test::SetProfileInfo(a.get(), "Thomas", NULL, "Jefferson",
       "declaration_guy@gmail.com", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       NULL);
   autofill_test::SetProfileInfo(a.get(), "Thomas", NULL, "Adams",
       "declaration_guy@gmail.com", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       NULL);
-  EXPECT_FALSE(a->IsSubsetOf(*b));
+  EXPECT_FALSE(a->IsSubsetOf(*b, "en-US"));
 }
 
 TEST(AutofillProfileTest, AssignmentOperator) {
   AutofillProfile a, b;
 
   // Result of assignment should be logically equal to the original profile.
   autofill_test::SetProfileInfo(&a, "Marion", "Mitchell", "Morrison",
                                 "marion@me.xyz", "Fox", "123 Zoo St.", "unit 5",
                                 "Hollywood", "CA", "91601", "US",
                                 "12345678910");
@@ skipping 189 matching lines @@
     options[i] = ASCIIToUTF16(kCountries[i]);
   }
 
   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);
+  profile.FillSelectControl(ADDRESS_HOME_COUNTRY, "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("Canada"), field.value);
 }
 
 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.FillSelectControl(ADDRESS_HOME_COUNTRY, &field);
+  profile.FillSelectControl(ADDRESS_HOME_COUNTRY, "en-US", &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) {
     options[i] = ASCIIToUTF16(kStates[i]);
   }
 
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = options;
   field.option_contents = options;
 
   AutofillProfile profile;
   profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
-  profile.FillSelectControl(ADDRESS_HOME_STATE, &field);
+  profile.FillSelectControl(ADDRESS_HOME_STATE, "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("California"), field.value);
 }
 
 TEST(AutofillProfileTest, AddressStateAbbrev) {
   const char* const kStates[] = {
     "AL", "CA"
   };
   std::vector<string16> options(arraysize(kStates));
   for (size_t i = 0; i < arraysize(kStates); ++i) {
     options[i] = ASCIIToUTF16(kStates[i]);
   }
 
   FormFieldData field;
   field.form_control_type = "select-one";
   field.option_values = options;
   field.option_contents = options;
 
   AutofillProfile profile;
   profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("California"));
-  profile.FillSelectControl(ADDRESS_HOME_STATE, &field);
+  profile.FillSelectControl(ADDRESS_HOME_STATE, "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("CA"), field.value);
 }
 
 TEST(AutofillProfileTest, FillByValue) {
   const char* const kStates[] = {
     "Alabama", "California"
   };
   std::vector<string16> values(arraysize(kStates));
   std::vector<string16> contents(arraysize(kStates));
   for (unsigned int i = 0; i < arraysize(kStates); ++i) {
     values[i] = ASCIIToUTF16(kStates[i]);
     contents[i] = ASCIIToUTF16(base::StringPrintf("%u", i));
   }
 
   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);
+  profile.FillSelectControl(ADDRESS_HOME_STATE, "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("California"), field.value);
 }
 
 TEST(AutofillProfileTest, FillByContents) {
   const char* const kStates[] = {
     "Alabama", "California"
   };
   std::vector<string16> values(arraysize(kStates));
   std::vector<string16> contents(arraysize(kStates));
   for (unsigned int i = 0; i < arraysize(kStates); ++i) {
     values[i] = ASCIIToUTF16(base::StringPrintf("%u", i + 1));
     contents[i] = ASCIIToUTF16(kStates[i]);
   }
 
   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);
+  profile.FillSelectControl(ADDRESS_HOME_STATE, "en-US", &field);
   EXPECT_EQ(ASCIIToUTF16("2"), field.value);
 }