[Autofill] Fix the dedupe of verified profiles.

Put the verified profiles last when deduping so they are never deleted in favor of a non verified profile.

Also added code so that verified profiles don't merge with other verified profiles.

When an unverified profiles is compared with a similar verified profile during dedupe, the verified profile is not changed and the unverified profile is discarded.

BUG=620522
TEST=PersonalDataManagerTest

Committed: https://crrev.com/80c06469b872723c27bf453b3f6ee8b06f747b27
Cr-Commit-Position: refs/heads/master@{#400459}

[sebsg, 2016-06-16 01:02:51]

Patchset #1 (id:1) has been deleted

[sebsg, 2016-06-16 01:03:05]

Description was changed from

==========
[Autofill] Fix the dedupe of verified profiles.

Put the verified profiles last when deduping so they are never deleted in favor
of a non verified profile.

BUG=620522
==========

to

==========
Put the verified profiles last when deduping so they are never deleted in favor
of a non verified profile.

BUG=620522
==========

[sebsg, 2016-06-16 01:04:20]

sebsg@chromium.org changed reviewers:
+ mathp@chromium.org

[sebsg, 2016-06-16 01:04:21]

Hi Math, could you please take a look? Thanks!

[sebsg, 2016-06-16 21:29:14]

Patchset #2 (id:40001) has been deleted

[sebsg, 2016-06-16 21:30:18]

Description was changed from

==========
Put the verified profiles last when deduping so they are never deleted in favor
of a non verified profile.

BUG=620522
==========

to

==========
Put the verified profiles last when deduping so they are never deleted in favor
of a non verified profile.

Also added code so that merged profiles 

BUG=620522
==========

[sebsg, 2016-06-16 21:33:11]

Description was changed from

==========
Put the verified profiles last when deduping so they are never deleted in favor
of a non verified profile.

Also added code so that merged profiles 

BUG=620522
==========

to

==========
Put the verified profiles last when deduping so they are never deleted in favor
of a non verified profile.

Also added code so that verified profiles don't merge with other verified
profiles.

When an unverified profiles is compared with a similar verified profile during
dedupe, the verified profile is not changed and the unverified profile is
discarded.

BUG=620522
TEST=PersonalDataManagerTest
==========

[sebsg, 2016-06-16 21:34:18]

PTAL?

[Mathieu, 2016-06-17 14:15:09]

lgtm

https://codereview.chromium.org/2075503002/diff/20001/components/autofill/cor...
File components/autofill/core/browser/personal_data_manager_unittest.cc (right):

https://codereview.chromium.org/2075503002/diff/20001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4672: // it's
original data when deduping with similar profiles, even if it has a
nit: its

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
File components/autofill/core/browser/personal_data_manager_unittest.cc (right):

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:2762:
personal_data_->SaveImportedProfile(new_verified_profile);
Is this even a possible codepath? The only way to add a verified profile is
through settings, and that calls personal_data_->UpdateProfile(profile).

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4672: // it's
original data when deduping with similar profiles, even if it has a
*its

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4731: // Only
the verified |profile2| with it's original data should have been kept.
*its

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4823: //
Tests that FindAndMergeDuplicateProfiles does not merge unverfied data into a
nit: unverified

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4871: // Sort
the profiles by frecency to have a deterministic order.
not sure why this is here? I would rather have the tests fail if we ever change
the real ordering function than have this logic. What do you think?

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4882: //
|imported_profile|'s data. Then |profile1| should have been compared to
fix comment?

[sebsg, 2016-06-17 17:09:02]

Thanks for the comments

https://codereview.chromium.org/2075503002/diff/20001/components/autofill/cor...
File components/autofill/core/browser/personal_data_manager_unittest.cc (right):

https://codereview.chromium.org/2075503002/diff/20001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4672: // it's
original data when deduping with similar profiles, even if it has a
On 2016/06/17 14:15:09, Mathieu Perreault wrote:
> nit: its

Done.

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
File components/autofill/core/browser/personal_data_manager_unittest.cc (right):

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:2762:
personal_data_->SaveImportedProfile(new_verified_profile);
On 2016/06/17 14:15:09, Mathieu Perreault wrote:
> Is this even a possible codepath? The only way to add a verified profile is
> through settings, and that calls personal_data_->UpdateProfile(profile).

Done.

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4672: // it's
original data when deduping with similar profiles, even if it has a
On 2016/06/17 14:15:09, Mathieu Perreault wrote:
> *its

Done.

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4731: // Only
the verified |profile2| with it's original data should have been kept.
On 2016/06/17 14:15:09, Mathieu Perreault wrote:
> *its

Done.

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4823: //
Tests that FindAndMergeDuplicateProfiles does not merge unverfied data into a
On 2016/06/17 14:15:09, Mathieu Perreault wrote:
> nit: unverified

Done.

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4871: // Sort
the profiles by frecency to have a deterministic order.
On 2016/06/17 14:15:09, Mathieu Perreault wrote:
> not sure why this is here? I would rather have the tests fail if we ever
change
> the real ordering function than have this logic. What do you think?

Otherwise the test fails half the time because the profiles are not in a
deterministic order.

Changed the call to GetProfilesToSuggest, which does the sorting.

https://codereview.chromium.org/2075503002/diff/60001/components/autofill/cor...
components/autofill/core/browser/personal_data_manager_unittest.cc:4882: //
|imported_profile|'s data. Then |profile1| should have been compared to
On 2016/06/17 14:15:09, Mathieu Perreault wrote:
> fix comment?

Done.

[sebsg, 2016-06-17 17:09:06]

The CQ bit was checked by sebsg@chromium.org

[sebsg, 2016-06-17 17:09:07]

The patchset sent to the CQ was uploaded after l-g-t-m from mathp@chromium.org
Link to the patchset: https://codereview.chromium.org/2075503002/#ps80001
(title: "Fixed comments")

[commit-bot: I haz the power, 2016-06-17 17:09:29]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2075503002/80001

[commit-bot: I haz the power, 2016-06-17 18:20:18]

Description was changed from

==========
Put the verified profiles last when deduping so they are never deleted in favor
of a non verified profile.

Also added code so that verified profiles don't merge with other verified
profiles.

When an unverified profiles is compared with a similar verified profile during
dedupe, the verified profile is not changed and the unverified profile is
discarded.

BUG=620522
TEST=PersonalDataManagerTest
==========

to

==========
Put the verified profiles last when deduping so they are never deleted in favor
of a non verified profile.

Also added code so that verified profiles don't merge with other verified
profiles.

When an unverified profiles is compared with a similar verified profile during
dedupe, the verified profile is not changed and the unverified profile is
discarded.

BUG=620522
TEST=PersonalDataManagerTest
==========

[commit-bot: I haz the power, 2016-06-17 18:20:19]

Committed patchset #3 (id:80001)

[commit-bot: I haz the power, 2016-06-17 18:21:37]

Description was changed from

==========
Put the verified profiles last when deduping so they are never deleted in favor
of a non verified profile.

Also added code so that verified profiles don't merge with other verified
profiles.

When an unverified profiles is compared with a similar verified profile during
dedupe, the verified profile is not changed and the unverified profile is
discarded.

BUG=620522
TEST=PersonalDataManagerTest
==========

to

==========
Put the verified profiles last when deduping so they are never deleted in favor
of a non verified profile.

Also added code so that verified profiles don't merge with other verified
profiles.

When an unverified profiles is compared with a similar verified profile during
dedupe, the verified profile is not changed and the unverified profile is
discarded.

BUG=620522
TEST=PersonalDataManagerTest

Committed: https://crrev.com/80c06469b872723c27bf453b3f6ee8b06f747b27
Cr-Commit-Position: refs/heads/master@{#400459}
==========

[commit-bot: I haz the power, 2016-06-17 18:21:38]

Patchset 3 (id:??) landed as
https://crrev.com/80c06469b872723c27bf453b3f6ee8b06f747b27
Cr-Commit-Position: refs/heads/master@{#400459}