Remove application locale cache in autofill code.

chrome/browser/webdata/autofill_profile_syncable_service.h

 // 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.
 #ifndef CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 #define CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 55 matching lines @@
       syncer::ModelType type) const OVERRIDE;
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) OVERRIDE;
 
   // AutofillWebDataServiceObserverOnDBThread implementation.
   virtual void AutofillProfileChanged(
       const AutofillProfileChange& change) OVERRIDE;
 
  protected:
-  explicit AutofillProfileSyncableService(
-      AutofillWebDataService* web_data_service,
-      const std::string& app_locale);
+  AutofillProfileSyncableService(AutofillWebDataService* web_data_service,
+                                 const std::string& app_locale);
 
   // A convenience wrapper of a bunch of state we pass around while
   // associating models, and send to the WebDatabase for persistence.
   // We do this so we hold the write lock for only a small period.
   // When storing the web db we are out of the write lock.
   struct DataBundle;
 
   // Helper to query WebDatabase for the current autofill state.
   // Made virtual for ease of mocking in the unit-test.
   // Caller owns returned |profiles|.
@@ skipping 66 matching lines @@
   // The same as |UpdateField|, but for multi-valued fields.
   static bool UpdateMultivaluedField(
       AutofillFieldType field_type,
       const ::google::protobuf::RepeatedPtrField<std::string>& new_value,
       AutofillProfile* autofill_profile);
 
   // Calls merge_into->OverwriteWithOrAddTo() and then checks if the
   // |merge_into| has extra data. Returns |true| if |merge_into| posseses some
   // multi-valued field values that are not in |merge_from|, false otherwise.
   static bool MergeProfile(const AutofillProfile& merge_from,
-                           AutofillProfile* merge_into);
+                           AutofillProfile* merge_into,
+                           const std::string& app_locale);
 
   // For unit-tests.
   AutofillProfileSyncableService();
   void set_sync_processor(syncer::SyncChangeProcessor* sync_processor) {
     sync_processor_.reset(sync_processor);
   }
 
   AutofillWebDataService* web_data_service_;  // WEAK
   std::string app_locale_;
   ScopedObserver<AutofillWebDataService, AutofillProfileSyncableService>
@@ skipping 21 matching lines @@
   std::vector<AutofillProfile*> profiles_to_add;
 
   // When we go through sync we find profiles that are similar but unmatched.
   // Merge such profiles.
   GUIDToProfileMap candidates_to_merge;
   // Profiles that have multi-valued fields that are not in sync.
   std::vector<AutofillProfile*> profiles_to_sync_back;
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_