Remove application locale cache in autofill code.

chrome/browser/webdata/autofill_profile_syncable_service.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 "chrome/browser/webdata/autofill_profile_syncable_service.h"
 
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 125 matching lines @@
   }
 
   // Check for similar unmatched profiles - they are created independently on
   // two systems, so merge them.
   for (GUIDToProfileMap::iterator it = bundle.candidates_to_merge.begin();
        it != bundle.candidates_to_merge.end(); ++it) {
     GUIDToProfileMap::iterator profile_to_merge =
         remaining_profiles.find(it->first);
     if (profile_to_merge != remaining_profiles.end()) {
       bundle.profiles_to_delete.push_back(profile_to_merge->second->guid());
-      if (MergeProfile(*(profile_to_merge->second), it->second))
+      if (MergeProfile(*(profile_to_merge->second), it->second, app_locale_))
         bundle.profiles_to_sync_back.push_back(it->second);
       DVLOG(2) << "[AUTOFILL SYNC]"
                << "Found similar profile in sync db but with a different guid: "
                << UTF16ToUTF8(it->second->GetRawInfo(NAME_FIRST))
                << UTF16ToUTF8(it->second->GetRawInfo(NAME_LAST))
                << "New guid " << it->second->guid()
                << ". Profile to be deleted "
                << profile_to_merge->second->guid();
       remaining_profiles.erase(profile_to_merge);
     }
@@ skipping 399 matching lines @@
       changed = true;
     }
   }
   if (changed)
     autofill_profile->SetRawMultiInfo(field_type, values);
   return changed;
 }
 
 bool AutofillProfileSyncableService::MergeProfile(
     const AutofillProfile& merge_from,
-    AutofillProfile* merge_into) {
-  merge_into->OverwriteWithOrAddTo(merge_from);
+    AutofillProfile* merge_into,
+    const std::string& app_locale) {
+  merge_into->OverwriteWithOrAddTo(merge_from, app_locale);
   return (merge_into->Compare(merge_from) != 0);
 }
 
 AutofillTable* AutofillProfileSyncableService::GetAutofillTable() const {
   return AutofillTable::FromWebDatabase(web_data_service_->GetDatabase());
 }
 
 AutofillProfileSyncableService::DataBundle::DataBundle() {}
 
 AutofillProfileSyncableService::DataBundle::~DataBundle() {}