Make autofill's Address store country using the country code so that app locale isn't needed for th…

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 29 matching lines @@
 class AutofillProfileSyncableService
     : public base::SupportsUserData::Data,
       public syncer::SyncableService,
       public AutofillWebDataServiceObserverOnDBThread,
       public base::NonThreadSafe {
  public:
   virtual ~AutofillProfileSyncableService();
 
   // Creates a new AutofillProfileSyncableService and hangs it off of
   // |web_data_service|, which takes ownership.
-  static void CreateForWebDataService(AutofillWebDataService* web_data_service);
+  static void CreateForWebDataService(AutofillWebDataService* web_data_service,
+                                      const std::string& app_locale);
   // Retrieves the AutofillProfileSyncableService stored on |web_data_service|.
   static AutofillProfileSyncableService* FromWebDataService(
       AutofillWebDataService* web_data_service);
 
   static syncer::ModelType model_type() { return syncer::AUTOFILL_PROFILE; }
 
   // syncer::SyncableService implementation.
   virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE;
   virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
   virtual syncer::SyncDataList GetAllSyncData(
       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);
+      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 21 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
                            MergeProfile);
 
   // The map of the guid to profiles owned by the |profiles_| vector.
   typedef std::map<std::string, AutofillProfile*> GUIDToProfileMap;
 
   // Helper function that overwrites |profile| with data from proto-buffer
   // |specifics|.
   static bool OverwriteProfileWithServerData(
       const sync_pb::AutofillProfileSpecifics& specifics,
-      AutofillProfile* profile);
+      AutofillProfile* profile,
+      const std::string& app_locale);
 
   // Writes |profile| data into supplied |profile_specifics|.
   static void WriteAutofillProfile(const AutofillProfile& profile,
                                    sync_pb::EntitySpecifics* profile_specifics);
 
   // Creates |profile_map| from the supplied |profiles| vector. Necessary for
   // fast processing of the changes.
   void CreateGUIDToProfileMap(const std::vector<AutofillProfile*>& profiles,
                               GUIDToProfileMap* profile_map);
 
@@ skipping 32 matching lines @@
   static bool MergeProfile(const AutofillProfile& merge_from,
                            AutofillProfile* merge_into);
 
   // 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_;

[Ilya Sherman, 2013/04/05 07:18:41]

nit: Can this be const?

[jam, 2013/04/05 07:35:35]

yes it can, but i'm personally not a fan of consting member variables.i
understand the argument in both sides, and i lean on this one. since it's not in
styl eguide, and note autofilltable already has it this way.

   ScopedObserver<AutofillWebDataService, AutofillProfileSyncableService>
       scoped_observer_;
 
   // Cached Autofill profiles. *Warning* deleted profiles are still in the
   // vector - use the |profiles_map_| to iterate through actual profiles.
   ScopedVector<AutofillProfile> profiles_;
   GUIDToProfileMap profiles_map_;
 
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
 
@@ skipping 12 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_