[Autofill] Set basic information when adding a new profiles and credit cards.

components/autofill/core/browser/webdata/autofill_profile_syncable_service.h

 // Copyright 2014 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_CORE_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 103 matching lines @@
 
   // Creates syncer::SyncData based on supplied |profile|.
   // Exposed for unit tests.
   static syncer::SyncData CreateData(const AutofillProfile& profile);
 
  private:
   friend class ::ProfileSyncServiceAutofillTest;
   FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
                            UpdateField);
   FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
-                           MergeProfile);
+                           MergeSimilarProfile);
 
   // 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);
 
@@ skipping 20 matching lines @@
   void ActOnChange(const AutofillProfileChange& change);
 
   AutofillTable* GetAutofillTable() const;
 
   // Helper to compare the local value and cloud value of a field, copy into
   // the local value if they differ, and return whether the change happened.
   static bool UpdateField(ServerFieldType field_type,
                           const 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_from| needs updating to
-  // be in sync with |merge_into|.
-  // TODO(isherman): Seems like this should return |true| if |merge_into| was
-  // modified at all: http://crbug.com/248440
-  static bool MergeProfile(const AutofillProfile& merge_from,
-                           AutofillProfile* merge_into,
-                           const std::string& app_locale);
+  // Calls merge_into->OverwriteWith() and then checks if the
+  // |merge_into| has extra data. Returns true the merge has made a change to

[Mathieu, 2016/04/22 20:54:28]

*if the merge

[sebsg, 2016/04/25 15:35:39]

Done.

+  // |merge_into|. This should be used only for similar profiles ie. profiles
+  // where the PrimaryValue() matches.
+  static bool MergeSimilarProfile(const AutofillProfile& merge_from,

[Mathieu, 2016/04/22 20:54:28]

nit: MergeSimilarProfiles?

[sebsg, 2016/04/25 15:35:39]

Done.

+                                  AutofillProfile* merge_into,
+                                  const std::string& app_locale);
 
   AutofillWebDataBackend* webdata_backend_;  // WEAK
   std::string app_locale_;
   ScopedObserver<AutofillWebDataBackend,
                  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_;
@@ skipping 20 matching lines @@
   // 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;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_