Chromium Code Reviews| Index: components/autofill/core/browser/webdata/autofill_profile_syncable_service.h |
| diff --git a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h |
| index 78c08726ea07fc1941bf29b7f50fd674b121bad5..360eb2b2f715c20f6bcbc4642114b14ffbde4dee 100644 |
| --- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h |
| +++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h |
| @@ -121,7 +121,7 @@ class AutofillProfileSyncableService |
| 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; |
| @@ -162,14 +162,13 @@ class AutofillProfileSyncableService |
| 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_; |