Remove application locale cache in autofill code.

components/autofill/browser/autofill_ie_toolbar_import_win_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 "components/autofill/browser/autofill_ie_toolbar_import_win.h"
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/win/registry.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/field_types.h"
 #include "sync/util/data_encryption_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::RegKey;
 
 // Defined in autofill_ie_toolbar_import_win.cc. Not exposed in the header file.
-bool ImportCurrentUserProfiles(std::vector<AutofillProfile>* profiles,
+bool ImportCurrentUserProfiles(const std::string& app_locale,
+                               std::vector<AutofillProfile>* profiles,
                                std::vector<CreditCard>* credit_cards);
 
 namespace {
 
 const wchar_t kUnitTestRegistrySubKey[] = L"SOFTWARE\\Chromium Unit Tests";
 const wchar_t kUnitTestUserOverrideSubKey[] =
     L"SOFTWARE\\Chromium Unit Tests\\HKCU Override";
 
 const wchar_t* const kProfileKey =
     L"Software\\Google\\Google Toolbar\\4.0\\Autofill\\Profiles";
@@ skipping 120 matching lines @@
   EXPECT_TRUE(cc_key.Valid());
   CreateSubkey(&cc_key, L"0", credit_card, arraysize(credit_card));
   EncryptAndWrite(&cc_key, &empty_password);
   EncryptAndWrite(&cc_key, &empty_salt);
 
   profile_key.Close();
   cc_key.Close();
 
   std::vector<AutofillProfile> profiles;
   std::vector<CreditCard> credit_cards;
-  EXPECT_TRUE(ImportCurrentUserProfiles(&profiles, &credit_cards));
+  EXPECT_TRUE(ImportCurrentUserProfiles("en-US", &profiles, &credit_cards));
   ASSERT_EQ(2U, profiles.size());
   // The profiles are read in reverse order.
   EXPECT_EQ(profile1[0].value, profiles[1].GetRawInfo(NAME_FIRST));
   EXPECT_EQ(profile1[1].value, profiles[1].GetRawInfo(NAME_MIDDLE));
   EXPECT_EQ(profile1[2].value, profiles[1].GetRawInfo(NAME_LAST));
   EXPECT_EQ(profile1[3].value, profiles[1].GetRawInfo(EMAIL_ADDRESS));
   EXPECT_EQ(profile1[4].value, profiles[1].GetRawInfo(COMPANY_NAME));
   EXPECT_EQ(profile1[7].value,
             profiles[1].GetInfo(PHONE_HOME_COUNTRY_CODE, "US"));
   EXPECT_EQ(profile1[6].value, profiles[1].GetInfo(PHONE_HOME_CITY_CODE, "US"));
@@ skipping 17 matching lines @@
 
   // Mock password encrypted cc.
   cc_key.Open(HKEY_CURRENT_USER, kCreditCardKey, KEY_ALL_ACCESS);
   EXPECT_TRUE(cc_key.Valid());
   EncryptAndWrite(&cc_key, &protected_password);
   EncryptAndWrite(&cc_key, &protected_salt);
   cc_key.Close();
 
   profiles.clear();
   credit_cards.clear();
-  EXPECT_TRUE(ImportCurrentUserProfiles(&profiles, &credit_cards));
+  EXPECT_TRUE(ImportCurrentUserProfiles("en-US", &profiles, &credit_cards));
   // Profiles are not protected.
   EXPECT_EQ(2U, profiles.size());
   // Credit cards are.
   EXPECT_EQ(0U, credit_cards.size());
 }