Remove application locale cache in autofill code.

components/autofill/browser/personal_data_manager.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 COMPONENTS_AUTOFILL_BROWSER_PERSONAL_DATA_MANAGER_H_
 #define COMPONENTS_AUTOFILL_BROWSER_PERSONAL_DATA_MANAGER_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 24 matching lines @@
 // Handles loading and saving Autofill profile information to the web database.
 // This class also stores the profiles loaded from the database for use during
 // Autofill.
 class PersonalDataManager : public WebDataServiceConsumer,
                             public AutofillWebDataServiceObserverOnUIThread {
  public:
   // A pair of GUID and variant index. Represents a single FormGroup and a
   // specific data variant.
   typedef std::pair<std::string, size_t> GUIDPair;
 
-  PersonalDataManager();
+  explicit PersonalDataManager(const std::string& app_locale);
   virtual ~PersonalDataManager();
 
   // Kicks off asynchronous loading of profiles and credit cards.
   void Init(content::BrowserContext* context);
 
   // WebDataServiceConsumer:
   virtual void OnWebDataServiceRequestDone(
       WebDataServiceBase::Handle h,
       const WDTypedResult* result) OVERRIDE;
 
@@ skipping 89 matching lines @@
   // Re-loads profiles and credit cards from the WebDatabase asynchronously.
   // In the general case, this is a no-op and will re-create the same
   // in-memory model as existed prior to the call.  If any change occurred to
   // profiles in the WebDatabase directly, as is the case if the browser sync
   // engine processed a change from the cloud, we will learn of these as a
   // result of this call.
   //
   // Also see SetProfile for more details.
   virtual void Refresh();
 
+  const std::string& app_locale() const { return app_locale_; }
+
   // Checks suitability of |profile| for adding to the user's set of profiles.
   static bool IsValidLearnableProfile(const AutofillProfile& profile);
 
   // Merges |profile| into one of the |existing_profiles| if possible; otherwise
   // appends |profile| to the end of that list. Fills |merged_profiles| with the
   // result.
   static bool MergeProfile(
       const AutofillProfile& profile,
       const std::vector<AutofillProfile*>& existing_profiles,
+      const std::string& app_locale,
       std::vector<AutofillProfile>* merged_profiles);
 
  protected:
   // Only PersonalDataManagerFactory and certain tests can create instances of
   // PersonalDataManager.
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, FirstMiddleLast);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, AutofillIsEnabledAtStartup);
   FRIEND_TEST_ALL_PREFIXES(PersonalDataManagerTest,
                            AggregateExistingAuxiliaryProfile);
   friend class AutofillTest;
@@ skipping 80 matching lines @@
   // is queried on another thread, we record the query handle until we
   // get called back.  We store handles for both profile and credit card queries
   // so they can be loaded at the same time.
   WebDataServiceBase::Handle pending_profiles_query_;
   WebDataServiceBase::Handle pending_creditcards_query_;
 
   // The observers.
   ObserverList<PersonalDataManagerObserver> observers_;
 
  private:
+  std::string app_locale_;
 
   // For logging UMA metrics. Overridden by metrics tests.
   scoped_ptr<const AutofillMetrics> metric_logger_;
 
   // Whether we have already logged the number of profiles this session.
   mutable bool has_logged_profile_count_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_PERSONAL_DATA_MANAGER_H_