Remove application locale cache in autofill code.

chrome/browser/webdata/autofill_profile_syncable_service_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/location.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/webdata/autofill/autofill_change.h"
@@ skipping 334 matching lines @@
   values.push_back(UTF8ToUTF16("Doe"));
   profile1.SetRawMultiInfo(NAME_LAST, values);
   values.push_back(UTF8ToUTF16("Other"));
   profile2.SetRawMultiInfo(NAME_LAST, values);
 
   values.clear();
   values.push_back(UTF8ToUTF16("650234567"));
   profile2.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);
 
   EXPECT_FALSE(AutofillProfileSyncableService::MergeProfile(profile2,
-                                                            &profile1));
+                                                            &profile1,
+                                                            "en-US"));
 
   profile1.GetRawMultiInfo(NAME_FIRST, &values);
   ASSERT_EQ(values.size(), 2U);
   EXPECT_EQ(values[0], UTF8ToUTF16("John"));
   EXPECT_EQ(values[1], UTF8ToUTF16("Jane"));
 
   profile1.GetRawMultiInfo(NAME_LAST, &values);
   ASSERT_EQ(values.size(), 2U);
   EXPECT_EQ(values[0], UTF8ToUTF16("Doe"));
   EXPECT_EQ(values[1], UTF8ToUTF16("Other"));
@@ skipping 13 matching lines @@
 
   values.clear();
   values.push_back(UTF8ToUTF16("Jane"));
   profile3.SetRawMultiInfo(NAME_FIRST, values);
 
   values.clear();
   values.push_back(UTF8ToUTF16("Doe"));
   profile3.SetRawMultiInfo(NAME_LAST, values);
 
   EXPECT_TRUE(AutofillProfileSyncableService::MergeProfile(profile3,
-                                                           &profile1));
+                                                           &profile1,
+                                                            "en-US"));
 
   profile1.GetRawMultiInfo(NAME_FIRST, &values);
   ASSERT_EQ(values.size(), 3U);
   EXPECT_EQ(values[0], UTF8ToUTF16("John"));
   EXPECT_EQ(values[1], UTF8ToUTF16("Jane"));
   EXPECT_EQ(values[2], UTF8ToUTF16("Jane"));
 
   profile1.GetRawMultiInfo(NAME_LAST, &values);
   ASSERT_EQ(values.size(), 3U);
   EXPECT_EQ(values[0], UTF8ToUTF16("Doe"));
@@ skipping 10 matching lines @@
   profile1.GetRawMultiInfo(EMAIL_ADDRESS, &values);
   ASSERT_EQ(values.size(), 3U);
   EXPECT_EQ(values[0], UTF8ToUTF16("1@1.com"));
   EXPECT_EQ(values[1], UTF8ToUTF16("2@1.com"));
   EXPECT_EQ(values[2], UTF8ToUTF16("3@1.com"));
 
   profile1.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
   ASSERT_EQ(values.size(), 1U);
   EXPECT_EQ(values[0], UTF8ToUTF16("650234567"));
 }