Note, you should be using CreateInferredLabels() function as in https://cs.chromium.org/chromium/src/chrome/browser/autofill/android/personal_data_manager_android.cc?rcl=0&l=688 because that takes care of correct ordering of fields in all countries.

Here are some screenshots of the new implementation:

Deleted: billingaddress.png 153 KB

	billingaddress.png 153 KB View Download

Deleted: multilineselection.png 180 KB

	multilineselection.png 180 KB View Download

+ Rouslan and Zach for feedback

Ship it! :-)

LGTM!

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

commit 1ededfa5db7e0abf94b0e3d89e101b2df3767b5d
Author: sebsg <sebsg@chromium.org>
Date: Tue Aug 30 13:47:55 2016

Also make the dropdown selection text be multiline.

BUG= 637332 

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

[add] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/android/java/res/layout/multiline_spinner_item.xml
[modify] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
[modify] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
[modify] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
[modify] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java
[modify] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java
[modify] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
[modify] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.java
[modify] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
[modify] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/browser/autofill/android/personal_data_manager_android.cc
[modify] https://crrev.com/1ededfa5db7e0abf94b0e3d89e101b2df3767b5d/chrome/browser/autofill/android/personal_data_manager_android.h

Your change meets the bar and is auto-approved for M54 (branch: 2840)

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

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

The merge didn't post here it seems... here is the link to the codereview:

https://codereview.chromium.org/2333723002/

verified in M54-54.0.2840.25 build

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

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/+/c1ab42fa5d13c8ce283f50973fbe221b6781b68c

commit c1ab42fa5d13c8ce283f50973fbe221b6781b68c
Author: sebsg <sebsg@chromium.org>
Date: Mon Sep 12 14:09:34 2016

Also make the dropdown selection text be multiline.

BUG= 637332 

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

Review URL: https://codereview.chromium.org/2333723002 .

Cr-Commit-Position: refs/branch-heads/2840@{#297}
Cr-Branched-From: 1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}

[add] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/android/java/res/layout/multiline_spinner_item.xml
[modify] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
[modify] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
[modify] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
[modify] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java
[modify] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java
[modify] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
[modify] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.java
[modify] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
[modify] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/browser/autofill/android/personal_data_manager_android.cc
[modify] https://crrev.com/c1ab42fa5d13c8ce283f50973fbe221b6781b68c/chrome/browser/autofill/android/personal_data_manager_android.h