[Merge m56][autofill] Merge can select the wrong address.

[Merge m56][autofill] Merge can select the wrong address.

Fixes a bug where, in the case where the the second address
should have been retained during merge, the first address is
retained, due to a typo in the referenced variable name.

BUG=669925
R=mathp@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2535103004
Cr-Commit-Position: refs/branch-heads/2883@{#700}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}
(cherry picked from commit 3cb0576de6902976d1b4271e0673aac0caa641fa)

Committed: https://chromium.googlesource.com/chromium/src/+/8951973f96b7dba48c5cf3406fa0650beced8e5b

[Mathieu, 2016-12-02 18:33:17]

Description was changed from

==========
[Merge m56][autofill] Merge can select the wrong address.

Fixes a bug where, in the case where the the second address
should have been retained during merge, the first address is
retained, due to a typo in the referenced variable name.

BUG=669925
R=mathp@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2535103004
Cr-Commit-Position: refs/branch-heads/2883@{#700}
Cr-Branched-From:
614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}
(cherry picked from commit 3cb0576de6902976d1b4271e0673aac0caa641fa)
==========

to

==========
[Merge m56][autofill] Merge can select the wrong address.

Fixes a bug where, in the case where the the second address
should have been retained during merge, the first address is
retained, due to a typo in the referenced variable name.

BUG=669925
R=mathp@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2535103004
Cr-Commit-Position: refs/branch-heads/2883@{#700}
Cr-Branched-From:
614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}
(cherry picked from commit 3cb0576de6902976d1b4271e0673aac0caa641fa)

Committed:
https://chromium.googlesource.com/chromium/src/+/8951973f96b7dba48c5cf3406fa0...
==========

[Mathieu, 2016-12-02 18:33:18]

Committed patchset #1 (id:1) manually as
8951973f96b7dba48c5cf3406fa0650beced8e5b.