The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ed255a47bc7dddd9605ca08109fa396485984dc8

commit ed255a47bc7dddd9605ca08109fa396485984dc8
Author: sebsg <sebsg@chromium.org>
Date: Thu Feb 02 22:26:34 2017

Implemented the conversion logic from Wallet addresses to local Autofill profiles:

At each sync, looks for server addresses that have not been converted to local profiles yet. Then, for each of the non-converted Wallet addresses, look for a similar local profile to merge into.

If one is found, merge into it following the existing merge logic.
If none is found, add it as a new local Autofill profile.

Also removed the assignation of an email address for Wallet addresses based on the user's account email, as it may have blocked some useful merges.

BUG= 680182 

Review-Url: https://codereview.chromium.org/2658843004
Cr-Commit-Position: refs/heads/master@{#447859}

[modify] https://crrev.com/ed255a47bc7dddd9605ca08109fa396485984dc8/components/autofill/core/browser/autofill_metrics.cc
[modify] https://crrev.com/ed255a47bc7dddd9605ca08109fa396485984dc8/components/autofill/core/browser/autofill_metrics.h
[modify] https://crrev.com/ed255a47bc7dddd9605ca08109fa396485984dc8/components/autofill/core/browser/autofill_metrics_unittest.cc
[modify] https://crrev.com/ed255a47bc7dddd9605ca08109fa396485984dc8/components/autofill/core/browser/personal_data_manager.cc
[modify] https://crrev.com/ed255a47bc7dddd9605ca08109fa396485984dc8/components/autofill/core/browser/personal_data_manager.h
[modify] https://crrev.com/ed255a47bc7dddd9605ca08109fa396485984dc8/components/autofill/core/browser/personal_data_manager_unittest.cc
[modify] https://crrev.com/ed255a47bc7dddd9605ca08109fa396485984dc8/components/autofill/core/browser/webdata/autofill_table.cc
[modify] https://crrev.com/ed255a47bc7dddd9605ca08109fa396485984dc8/components/autofill/core/browser/webdata/autofill_table_unittest.cc
[modify] https://crrev.com/ed255a47bc7dddd9605ca08109fa396485984dc8/tools/metrics/histograms/histograms.xml

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c853dbe32cdd2b2a6699593fe8e06879568bc6db

commit c853dbe32cdd2b2a6699593fe8e06879568bc6db
Author: sebsg <sebsg@chromium.org>
Date: Fri Feb 03 16:46:05 2017

[Autofill] Use user's email for converted wallet addresses.

Since Wallet addresses don't have an email address, the signed-in
user's email address should be used if the Wallet address is not
merged into an existing local profile.

BUG= 680182 

Review-Url: https://codereview.chromium.org/2671813005
Cr-Commit-Position: refs/heads/master@{#448008}

[modify] https://crrev.com/c853dbe32cdd2b2a6699593fe8e06879568bc6db/components/autofill/core/browser/personal_data_manager.cc
[modify] https://crrev.com/c853dbe32cdd2b2a6699593fe8e06879568bc6db/components/autofill/core/browser/personal_data_manager_unittest.cc

Your change meets the bar and is auto-approved for M57. Please go ahead and merge the CL to branch 2987 manually. Please contact milestone owner if you have questions.
Owners: amineer@(clank), cmasso@(bling), ketakid@(cros), govind@(desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Please merge your change to M57 branch 2987 before 5:00 PM PT, Monday (02/06/) so we can pick it up for next Beta release. Thank you.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/85af9f1bc1d92dedf975aa565f5851b5365b79af

commit 85af9f1bc1d92dedf975aa565f5851b5365b79af
Author: sebsg <sebsg@chromium.org>
Date: Mon Feb 06 15:23:21 2017

Implemented the conversion logic from Wallet addresses to local Autofill profiles:

At each sync, looks for server addresses that have not been converted to local profiles yet. Then, for each of the non-converted Wallet addresses, look for a similar local profile to merge into.

If one is found, merge into it following the existing merge logic.
If none is found, add it as a new local Autofill profile.

Also removed the assignation of an email address for Wallet addresses based on the user's account email, as it may have blocked some useful merges.

BUG= 680182 

Review-Url: https://codereview.chromium.org/2658843004
Cr-Commit-Position: refs/heads/master@{#447859}
(cherry picked from commit ed255a47bc7dddd9605ca08109fa396485984dc8)

Review-Url: https://codereview.chromium.org/2678013002 .
Cr-Commit-Position: refs/branch-heads/2987@{#325}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}

[modify] https://crrev.com/85af9f1bc1d92dedf975aa565f5851b5365b79af/components/autofill/core/browser/autofill_metrics.cc
[modify] https://crrev.com/85af9f1bc1d92dedf975aa565f5851b5365b79af/components/autofill/core/browser/autofill_metrics.h
[modify] https://crrev.com/85af9f1bc1d92dedf975aa565f5851b5365b79af/components/autofill/core/browser/autofill_metrics_unittest.cc
[modify] https://crrev.com/85af9f1bc1d92dedf975aa565f5851b5365b79af/components/autofill/core/browser/personal_data_manager.cc
[modify] https://crrev.com/85af9f1bc1d92dedf975aa565f5851b5365b79af/components/autofill/core/browser/personal_data_manager.h
[modify] https://crrev.com/85af9f1bc1d92dedf975aa565f5851b5365b79af/components/autofill/core/browser/personal_data_manager_unittest.cc
[modify] https://crrev.com/85af9f1bc1d92dedf975aa565f5851b5365b79af/components/autofill/core/browser/webdata/autofill_table.cc
[modify] https://crrev.com/85af9f1bc1d92dedf975aa565f5851b5365b79af/components/autofill/core/browser/webdata/autofill_table_unittest.cc
[modify] https://crrev.com/85af9f1bc1d92dedf975aa565f5851b5365b79af/tools/metrics/histograms/histograms.xml

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c36552b1dfa02ee19dc9f1bf8c80bc75d5323b1b

commit c36552b1dfa02ee19dc9f1bf8c80bc75d5323b1b
Author: sebsg <sebsg@chromium.org>
Date: Mon Feb 06 15:28:31 2017

[Autofill] Use user's email for converted wallet addresses.

Since Wallet addresses don't have an email address, the signed-in
user's email address should be used if the Wallet address is not
merged into an existing local profile.

BUG= 680182 

Review-Url: https://codereview.chromium.org/2671813005
Cr-Commit-Position: refs/heads/master@{#448008}
(cherry picked from commit c853dbe32cdd2b2a6699593fe8e06879568bc6db)

Review-Url: https://codereview.chromium.org/2671423002 .
Cr-Commit-Position: refs/branch-heads/2987@{#326}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}

[modify] https://crrev.com/c36552b1dfa02ee19dc9f1bf8c80bc75d5323b1b/components/autofill/core/browser/personal_data_manager.cc
[modify] https://crrev.com/c36552b1dfa02ee19dc9f1bf8c80bc75d5323b1b/components/autofill/core/browser/personal_data_manager_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/f68dab39cd8b9748e3b70c2ba32ba1df6d26438d

commit f68dab39cd8b9748e3b70c2ba32ba1df6d26438d
Author: sebsg <sebsg@chromium.org>
Date: Mon Feb 06 16:34:54 2017

Revert of [Autofill] Use user's email for converted wallet addresses. (patchset #1 id:1 of https://codereview.chromium.org/2671423002/ )

Reason for revert:
Breakage on Clank

Original issue's description:
> [Autofill] Use user's email for converted wallet addresses.
>
> Since Wallet addresses don't have an email address, the signed-in
> user's email address should be used if the Wallet address is not
> merged into an existing local profile.
>
> BUG= 680182 
>
> Review-Url: https://codereview.chromium.org/2671813005
> Cr-Commit-Position: refs/heads/master@{#448008}
> (cherry picked from commit c853dbe32cdd2b2a6699593fe8e06879568bc6db)
>
> Review-Url: https://codereview.chromium.org/2671423002 .
> Cr-Commit-Position: refs/branch-heads/2987@{#326}
> Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
> Committed: https://chromium.googlesource.com/chromium/src/+/c36552b1dfa02ee19dc9f1bf8c80bc75d5323b1b

TBR=
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 680182 

Review-Url: https://codereview.chromium.org/2676343002
Cr-Commit-Position: refs/branch-heads/2987@{#329}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}

[modify] https://crrev.com/f68dab39cd8b9748e3b70c2ba32ba1df6d26438d/components/autofill/core/browser/personal_data_manager.cc
[modify] https://crrev.com/f68dab39cd8b9748e3b70c2ba32ba1df6d26438d/components/autofill/core/browser/personal_data_manager_unittest.cc

Was reverted from 57 after all. Too many CL merges would be needed to have the complete feature.