[Autofill] Sort profiles and credit cards by frecency in PaymentRequest.

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 468 matching lines @@
 
     public List<AutofillProfile> getAddressOnlyProfiles() {
         return getProfilesWithAddressOnlyLabels(true);
     }
 
     private List<AutofillProfile> getProfilesWithAddressOnlyLabels(boolean addressOnly) {
         ThreadUtils.assertOnUiThread();
 
         String[] profileLabels = nativeGetProfileLabels(mPersonalDataManagerAndroid, addressOnly);
 
-        int profileCount = nativeGetProfileCount(mPersonalDataManagerAndroid);
-        List<AutofillProfile> profiles = new ArrayList<AutofillProfile>(profileCount);
-        for (int i = 0; i < profileCount; i++) {
-            AutofillProfile profile = nativeGetProfileByIndex(mPersonalDataManagerAndroid, i);
+        String[] profileGUIDs = nativeGetProfileGUIDsToSuggest(mPersonalDataManagerAndroid);

[Mathieu, 2016/05/20 13:57:08]

Why do we need to get the GUIDs before the profiles? Can we not have a method
that returns the profiles themselves, below? 

nativeGetProfileByGUID -> nativeGetProfilesToSuggest

Is it because we can't return an array of AutofillProfile over the JNI bridge?

[sebsg, 2016/05/24 17:27:32]

I was unsure myself. Here is what I asked in another comment to Rouslan: 

I added a method that returns the guids in the order
they should be presented to the user. I thought of just returning a list or
array of profiles/cards but it didn't seem easy to do. I suppose that's why they
were pulled from their index before. If it's something you would like I could
try to do it here or in a future CL.

[Mathieu, 2016/05/24 17:54:48]

It does seem difficult. I'm fine with this solution.

+
+        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]);
             profiles.add(profile);
         }
 
         return profiles;
     }
 
     public AutofillProfile getProfile(String guid) {
         ThreadUtils.assertOnUiThread();
         return nativeGetProfileByGUID(mPersonalDataManagerAndroid, guid);
     }
 
     public void deleteProfile(String guid) {
         ThreadUtils.assertOnUiThread();
         nativeRemoveByGUID(mPersonalDataManagerAndroid, guid);
     }
 
     public String setProfile(AutofillProfile profile) {
         ThreadUtils.assertOnUiThread();
         return nativeSetProfile(mPersonalDataManagerAndroid, profile);
     }
 
     public List<CreditCard> getCreditCards() {
         ThreadUtils.assertOnUiThread();
-        int count = nativeGetCreditCardCount(mPersonalDataManagerAndroid);
-        List<CreditCard> cards = new ArrayList<CreditCard>(count);
-        for (int i = 0; i < count; i++) {
-            cards.add(nativeGetCreditCardByIndex(mPersonalDataManagerAndroid, i));
+
+        String[] creditCardGUIDs = nativeGetCreditCardGUIDsToSuggest(mPersonalDataManagerAndroid);
+
+        List<CreditCard> cards = new ArrayList<CreditCard>(creditCardGUIDs.length);
+        for (int i = 0; i < creditCardGUIDs.length; i++) {
+            cards.add(nativeGetCreditCardByGUID(mPersonalDataManagerAndroid, creditCardGUIDs[i]));
         }
         return cards;
     }
 
     public CreditCard getCreditCard(String guid) {
         ThreadUtils.assertOnUiThread();
         return nativeGetCreditCardByGUID(mPersonalDataManagerAndroid, guid);
     }
 
     public String setCreditCard(CreditCard card) {
         ThreadUtils.assertOnUiThread();
         return nativeSetCreditCard(mPersonalDataManagerAndroid, card);
     }
 
     public void deleteCreditCard(String guid) {
         ThreadUtils.assertOnUiThread();
         nativeRemoveByGUID(mPersonalDataManagerAndroid, guid);
     }
 
     public void clearUnmaskedCache(String guid) {
         nativeClearUnmaskedCache(mPersonalDataManagerAndroid, guid);
     }
 
     public void getFullCard(WebContents webContents, String guid,
             FullCardRequestDelegate delegate) {
         nativeGetFullCardForPaymentRequest(
                 mPersonalDataManagerAndroid, webContents, guid, delegate);
     }
 
+    @VisibleForTesting
+    public void setProfileUseStatsForTest(String guid, int count, int date) {
+        ThreadUtils.assertOnUiThread();
+        nativeSetProfileUseStatsForTest(mPersonalDataManagerAndroid, guid, count, date);
+    }
+
+    @VisibleForTesting
+    public void setCreditCardUseStatsForTest(String guid, int count, int date) {

[Mathieu, 2016/05/20 13:57:08]

nit: ForTesting

[sebsg, 2016/05/24 17:27:32]

Done.

+        ThreadUtils.assertOnUiThread();
+        nativeSetCreditCardUseStatsForTest(mPersonalDataManagerAndroid, guid, count, date);
+    }
+
     /**
      * @return Whether the Autofill feature is enabled.
      */
     public static boolean isAutofillEnabled() {
         return nativeIsAutofillEnabled();
     }
 
     /**
      * Enables or disables the Autofill feature.
      * @param enable True to disable Autofill, false otherwise.
@@ skipping 19 matching lines @@
     /**
      * Enables or disables the Payments integration.
      * @param enable True to enable Payments data import.
      */
     public static void setPaymentsIntegrationEnabled(boolean enable) {
         nativeSetPaymentsIntegrationEnabled(enable);
     }
 
     private native long nativeInit();
     private native int nativeGetProfileCount(long nativePersonalDataManagerAndroid);
+    private native String[] nativeGetProfileGUIDsToSuggest(long nativePersonalDataManagerAndroid);
     private native String[] nativeGetProfileLabels(long nativePersonalDataManagerAndroid,
             boolean addressOnly);
-    private native AutofillProfile nativeGetProfileByIndex(long nativePersonalDataManagerAndroid,
-            int index);
     private native AutofillProfile nativeGetProfileByGUID(long nativePersonalDataManagerAndroid,
             String guid);
     private native String nativeSetProfile(long nativePersonalDataManagerAndroid,
             AutofillProfile profile);
+    private native String[] nativeGetCreditCardGUIDsToSuggest(
+            long nativePersonalDataManagerAndroid);
     private native int nativeGetCreditCardCount(long nativePersonalDataManagerAndroid);
-    private native CreditCard nativeGetCreditCardByIndex(long nativePersonalDataManagerAndroid,
-            int index);
     private native CreditCard nativeGetCreditCardByGUID(long nativePersonalDataManagerAndroid,
             String guid);
     private native String nativeSetCreditCard(long nativePersonalDataManagerAndroid,
             CreditCard card);
     private native void nativeRemoveByGUID(long nativePersonalDataManagerAndroid, String guid);
+    private native void nativeSetProfileUseStatsForTest(
+            long nativePersonalDataManagerAndroid, String guid, int count, int date);
+    private native void nativeSetCreditCardUseStatsForTest(
+            long nativePersonalDataManagerAndroid, String guid, int count, int date);
     private native void nativeClearUnmaskedCache(
             long nativePersonalDataManagerAndroid, String guid);
     private native void nativeGetFullCardForPaymentRequest(long nativePersonalDataManagerAndroid,
             WebContents webContents, String guid, 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);
 }