Chromium Code Reviews| Index: components/autofill/core/browser/autofill_profile.cc |
| diff --git a/components/autofill/core/browser/autofill_profile.cc b/components/autofill/core/browser/autofill_profile.cc |
| index 86d3e4c05833df0df077c40ea7b75a70aecb292e..442ed9cbf1b30ffb5c6478cf3f213884aa739b1c 100644 |
| --- a/components/autofill/core/browser/autofill_profile.cc |
| +++ b/components/autofill/core/browser/autofill_profile.cc |
| @@ -416,11 +416,10 @@ bool AutofillProfile::EqualsSansOrigin(const AutofillProfile& profile) const { |
| Compare(profile) == 0; |
| } |
| -bool AutofillProfile::EqualsForSyncPurposes(const AutofillProfile& profile) |
| - const { |
| +bool AutofillProfile::EqualsForSyncPurposes( |
|
Mathieu
2016/04/22 20:54:27
nit: let's revert those lines to previous formatti
sebsg
2016/04/25 15:35:39
Done.
|
| + const AutofillProfile& profile) const { |
| return use_count() == profile.use_count() && |
| - use_date() == profile.use_date() && |
| - EqualsSansGuid(profile); |
| + use_date() == profile.use_date() && EqualsSansGuid(profile); |
| } |
| bool AutofillProfile::operator==(const AutofillProfile& profile) const { |
| @@ -432,7 +431,8 @@ bool AutofillProfile::operator!=(const AutofillProfile& profile) const { |
| } |
| const base::string16 AutofillProfile::PrimaryValue() const { |
| - return GetRawInfo(ADDRESS_HOME_LINE1) + GetRawInfo(ADDRESS_HOME_CITY); |
| + return GetRawInfo(NAME_FIRST) + GetRawInfo(NAME_LAST) + |
| + GetRawInfo(ADDRESS_HOME_LINE1) + GetRawInfo(ADDRESS_HOME_CITY); |
| } |
| bool AutofillProfile::IsSubsetOf(const AutofillProfile& profile, |
| @@ -1031,8 +1031,7 @@ FormGroup* AutofillProfile::MutableFormGroupForType(const AutofillType& type) { |
| bool AutofillProfile::EqualsSansGuid(const AutofillProfile& profile) const { |
| return origin() == profile.origin() && |
| - language_code() == profile.language_code() && |
| - Compare(profile) == 0; |
| + language_code() == profile.language_code() && Compare(profile) == 0; |
|
Mathieu
2016/04/22 20:54:27
leave previous formatting?
sebsg
2016/04/25 15:35:39
Done.
|
| } |
| // So we can compare AutofillProfiles with EXPECT_EQ(). |