[Payments] Show name and address when selecting a CC billing address.

chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.autofill;
 
 import android.content.Context;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
@@ skipping 500 matching lines @@
         ThreadUtils.assertOnUiThread();
         assert (mDataObservers.size() > 0);
         assert (mDataObservers.contains(observer));
         mDataObservers.remove(observer);
     }
 
     // TODO(crbug.com/616102): Reduce the number of Java to Native calls when getting profiles.
     /**
      * Gets the profiles to show in the settings page. Returns all the profiles without any
      * processing.
+     *
+     * @return The list of profiles to show in the settings.
      */
     public List<AutofillProfile> getProfilesForSettings() {
         ThreadUtils.assertOnUiThread();
         return getProfilesWithLabels(nativeGetProfileLabelsForSettings(mPersonalDataManagerAndroid),
                 nativeGetProfileGUIDsForSettings(mPersonalDataManagerAndroid));
     }
 
     // TODO(crbug.com/616102): Reduce the number of Java to Native calls when getting profiles.
     /**
      * Gets the profiles to suggest when filling a form or completing a transaction. The profiles
      * will have been processed to be more relevant to the user.
+     *
+     * @param includeName Whether to include the name in the profile's label.
+     * @return The list of profiles to suggest to the user.
      */
-    public List<AutofillProfile> getProfilesToSuggest() {
+    public List<AutofillProfile> getProfilesToSuggest(boolean includeName) {
         ThreadUtils.assertOnUiThread();
-        return getProfilesWithLabels(nativeGetProfileLabelsToSuggest(mPersonalDataManagerAndroid),
+        return getProfilesWithLabels(nativeGetProfileLabelsToSuggest(mPersonalDataManagerAndroid,
+                includeName),

[please use gerrit instead, 2016/08/26 16:46:15]

This indentation looks funny. Something like this instead?

return getProfilesWithLabels(
        nativeGetProfileLabelsToSuggest(
                mPersonalDataManagerAndroid, includeName),
        nativeGetprofileGUIDstoSuggest(mPersonalDataManagerAndroid));

[sebsg, 2016/08/26 19:36:45]

Done.

                 nativeGetProfileGUIDsToSuggest(mPersonalDataManagerAndroid));
     }
 
     private List<AutofillProfile> getProfilesWithLabels(
             String[] profileLabels, String[] profileGUIDs) {
         List<AutofillProfile> profiles = new ArrayList<AutofillProfile>(profileGUIDs.length);
         for (int i = 0; i < profileGUIDs.length; i++) {
             AutofillProfile profile =
                     nativeGetProfileByGUID(mPersonalDataManagerAndroid, profileGUIDs[i]);
             profile.setLabel(profileLabels[i]);
@@ skipping 198 matching lines @@
      */
     public static void setPaymentsIntegrationEnabled(boolean enable) {
         nativeSetPaymentsIntegrationEnabled(enable);
     }
 
     private native long nativeInit();
     private native String[] nativeGetProfileGUIDsForSettings(long nativePersonalDataManagerAndroid);
     private native String[] nativeGetProfileGUIDsToSuggest(long nativePersonalDataManagerAndroid);
     private native String[] nativeGetProfileLabelsForSettings(
             long nativePersonalDataManagerAndroid);
-    private native String[] nativeGetProfileLabelsToSuggest(long nativePersonalDataManagerAndroid);
+    private native String[] nativeGetProfileLabelsToSuggest(long nativePersonalDataManagerAndroid,
+            boolean includeName);
     private native AutofillProfile nativeGetProfileByGUID(long nativePersonalDataManagerAndroid,
             String guid);
     private native String nativeSetProfile(long nativePersonalDataManagerAndroid,
             AutofillProfile profile);
     private native String nativeGetAddressLabelForPaymentRequest(
             long nativePersonalDataManagerAndroid, AutofillProfile profile);
     private native String[] nativeGetCreditCardGUIDsForSettings(
             long nativePersonalDataManagerAndroid);
     private native String[] nativeGetCreditCardGUIDsToSuggest(
             long nativePersonalDataManagerAndroid);
@@ skipping 31 matching lines @@
             long nativePersonalDataManagerAndroid, String guid);
     private native void nativeGetFullCardForPaymentRequest(long nativePersonalDataManagerAndroid,
             WebContents webContents, CreditCard card, FullCardRequestDelegate delegate);
     private static native boolean nativeIsAutofillEnabled();
     private static native void nativeSetAutofillEnabled(boolean enable);
     private static native boolean nativeIsAutofillManaged();
     private static native boolean nativeIsPaymentsIntegrationEnabled();
     private static native void nativeSetPaymentsIntegrationEnabled(boolean enable);
     private static native String nativeToCountryCode(String countryName);
 }