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

commit 1eeee730395362b15e304fa65fa36c5a0bc5e204
Author: sebsg <sebsg@chromium.org>
Date: Mon Mar 06 22:23:12 2017

[Payments] Update server card billing if the address has already converted

Before this patch, if you added a new server card where the billing
address was already converted (with an older card for example), the
billing address id for the new card was not updated.

With this patch, these cards will be updated too.

For server cards with a billing address that was already converted,
look for a local profile that matches it and update the id in the card

BUG= 698364 

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

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

Per my comment on the CL that landed in #2,
I synced this morning and now I'm getting crashes on this DCHECK:
[FATAL:personal_data_manager.cc(1955)] Check failed: it != server_id_profiles_map->end().


I'm not sure why its failing but it's happening consistently every time I open start Chrome. What sort of debugging information do you need?

Here's some simple info to start with:
OnWebDataServiceRequestDone is called and ReceiveLoadedDbValues is called for server_profiles_ and server_credit_cards_

In ::ConvertWalletAddressesToLocalProfiles() server_credit_cards_ has size 1 and server_profiles_ (and therefore the server_id_profiles_map) has size 0.

I have one autofill credit card on my local Chrome build from Google Payments. It appears that there is no billing address associated with the card. Screenshot attached from my the "Edit credit card" preferences screen.

Deleted: Screenshot_20170307-172501.png 63.8 KB

	Screenshot_20170307-172501.png 63.8 KB View Download

Thanks, I talk with some Wallet folks and they tell me that it's possible that they don't send an address sometimes. I removed the DCHECK.

Thanks!

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

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

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

commit 8aa2597c18b4dc96ca1fd2ab3311e7ce1084194c
Author: sebsg <sebsg@chromium.org>
Date: Fri Mar 10 16:17:02 2017

[Merge-58] Update server card billing for already converted addresses

Before this patch, if you added a new server card where the billing
address was already converted (with an older card for example), the
billing address id for the new card was not updated.

With this patch, these cards will be updated too.

For server cards with a billing address that was already converted,
look for a local profile that matches it and update the id in the card

BUG= 698364 

Review-Url: https://codereview.chromium.org/2734463004
Cr-Commit-Position: refs/heads/master@{#454976}
(cherry picked from commit 1eeee730395362b15e304fa65fa36c5a0bc5e204)

NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2745763002
Cr-Commit-Position: refs/branch-heads/3029@{#110}
Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}

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