[Payments] Code Refactoring for the Subkey Request

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 50 matching lines @@
          */
         @CalledByNative("FullCardRequestDelegate")
         void onFullCardError();
     }
 
     /**
      * Callback for subKeys request.
      */
     public interface GetSubKeysRequestDelegate {
         /**
-         * Called when the sub-keys are received sucessfully.
-         * Here the sub-keys are admin areas.
+         * Called when the subkeys are received sucessfully.
+         * Here the subkeys are admin areas.
          *
          * @param subKeys The subKeys.
          */
         @CalledByNative("GetSubKeysRequestDelegate")
         void onSubKeysReceived(String[] subKeys);
     }
 
     /**
      * Callback for normalized addresses.
      */
@@ skipping 448 matching lines @@
     // Suppress FindBugs warning, since |sManager| is only used on the UI thread.
     @SuppressFBWarnings("LI_LAZY_INIT_STATIC")
     public static PersonalDataManager getInstance() {
         ThreadUtils.assertOnUiThread();
         if (sManager == null) {
             sManager = new PersonalDataManager();
         }
         return sManager;
     }
 
-    private static int sNormalizationTimeoutSeconds = 5;
+    private static int sRequestTimeoutSeconds = 5;
 
     private final long mPersonalDataManagerAndroid;
     private final List<PersonalDataManagerObserver> mDataObservers =
             new ArrayList<PersonalDataManagerObserver>();
 
     private PersonalDataManager() {
         // Note that this technically leaks the native object, however, PersonalDataManager
         // is a singleton that lives forever and there's no clean shutdown of Chrome on Android
         mPersonalDataManagerAndroid = nativeInit();
     }
@@ skipping 280 matching lines @@
      * Starts loading the sub-key request rules for the specified {@code regionCode}.
      *
      * @param regionCode The code of the region for which to load the rules.
      */
     public void loadRulesForSubKeys(String regionCode) {
         ThreadUtils.assertOnUiThread();
         nativeLoadRulesForSubKeys(mPersonalDataManagerAndroid, regionCode);
     }
 
     /**
-     * Starts loading the sub keys for the specified {@code regionCode}.
+     * Starts requesting the subkeys for the specified {@code regionCode}, if the rules
+     * associated with the {@code regionCode} are done loading. Otherwise sets up the callback to
+     * start loading the subkeys when the rules are loaded. The received subkeys will be sent
+     * to the {@code delegate}. If the subkeys are not received in the specified
+     * {@code sRequestTimeoutSeconds}, the {@code delegate} will be notified.
      *
-     * @param regionCode The code of the region for which to load the sub keys.
+     * @param regionCode The code of the region for which to load the subkeys.
+     * @param delegate The object requesting the subkeys.
      */
     public void getRegionSubKeys(String regionCode, GetSubKeysRequestDelegate delegate) {
         ThreadUtils.assertOnUiThread();
-        nativeStartRegionSubKeysRequest(mPersonalDataManagerAndroid, regionCode, delegate);
+        nativeStartRegionSubKeysRequest(
+                mPersonalDataManagerAndroid, regionCode, sRequestTimeoutSeconds, delegate);
     }
 
-    /** Cancels the pending sub keys request. */
+    /** Cancels the pending subkeys request. */
     public void cancelPendingGetSubKeys() {
         ThreadUtils.assertOnUiThread();
         nativeCancelPendingGetSubKeys(mPersonalDataManagerAndroid);
     }
 
     /**
      * Normalizes the address of the profile associated with the {@code guid} if the rules
      * associated with the {@code regionCode} are done loading. Otherwise sets up the callback to
      * start normalizing the address when the rules are loaded. The normalized profile will be sent
      * to the {@code delegate}. If the profile is not normalized in the specified
-     * {@code sNormalizationTimeoutSeconds}, the {@code delegate} will be notified.
+     * {@code sRequestTimeoutSeconds}, the {@code delegate} will be notified.
      *
      * @param profile The profile to normalize.
      * @param regionCode The region code indicating which rules to use for normalization.
      * @param delegate The object requesting the normalization.
      */
     public void normalizeAddress(
             AutofillProfile profile, String regionCode, NormalizedAddressRequestDelegate delegate) {
         ThreadUtils.assertOnUiThread();
-        nativeStartAddressNormalization(mPersonalDataManagerAndroid, profile, regionCode,
-                sNormalizationTimeoutSeconds, delegate);
+        nativeStartAddressNormalization(
+                mPersonalDataManagerAndroid, profile, regionCode, sRequestTimeoutSeconds, delegate);
     }
 
     /**
      * Checks whether the Autofill PersonalDataManager has profiles.
      *
      * @return True If there are profiles.
      */
     public boolean hasProfiles() {
         return nativeHasProfiles(mPersonalDataManagerAndroid);
     }
@@ skipping 38 matching lines @@
 
     /**
      * Enables or disables the Payments integration.
      * @param enable True to enable Payments data import.
      */
     public static void setPaymentsIntegrationEnabled(boolean enable) {
         nativeSetPaymentsIntegrationEnabled(enable);
     }
 
     @VisibleForTesting
-    public static void setNormalizationTimeoutForTesting(int timeout) {
-        sNormalizationTimeoutSeconds = timeout;
+    public static void setRequestTimeoutForTesting(int timeout) {
+        sRequestTimeoutSeconds = timeout;
     }
 
     /**
      * @return The sub-key request timeout in milliseconds.
      */
     public static long getRequestTimeoutMS() {
-        return TimeUnit.SECONDS.toMillis(sNormalizationTimeoutSeconds);
+        return TimeUnit.SECONDS.toMillis(sRequestTimeoutSeconds);
     }
 
     private native long nativeInit();
     private native boolean nativeIsDataLoaded(long nativePersonalDataManagerAndroid);
     private native String[] nativeGetProfileGUIDsForSettings(long nativePersonalDataManagerAndroid);
     private native String[] nativeGetProfileGUIDsToSuggest(long nativePersonalDataManagerAndroid);
     private native String[] nativeGetProfileLabelsForSettings(
             long nativePersonalDataManagerAndroid);
     private native String[] nativeGetProfileLabelsToSuggest(long nativePersonalDataManagerAndroid,
             boolean includeNameInLabel, boolean includeOrganizationInLabel,
@@ skipping 49 matching lines @@
     private native void nativeGetFullCardForPaymentRequest(long nativePersonalDataManagerAndroid,
             WebContents webContents, CreditCard card, FullCardRequestDelegate delegate);
     private native void nativeLoadRulesForAddressNormalization(
             long nativePersonalDataManagerAndroid, String regionCode);
     private native void nativeLoadRulesForSubKeys(
             long nativePersonalDataManagerAndroid, String regionCode);
     private native void nativeStartAddressNormalization(long nativePersonalDataManagerAndroid,
             AutofillProfile profile, String regionCode, int timeoutSeconds,
             NormalizedAddressRequestDelegate delegate);
     private native void nativeStartRegionSubKeysRequest(long nativePersonalDataManagerAndroid,
-            String regionCode, GetSubKeysRequestDelegate delegate);
+            String regionCode, int timeoutSeconds, GetSubKeysRequestDelegate delegate);
     private static native boolean nativeHasProfiles(long nativePersonalDataManagerAndroid);
     private static native boolean nativeHasCreditCards(long nativePersonalDataManagerAndroid);
     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);
     private static native void nativeCancelPendingGetSubKeys(long nativePersonalDataManagerAndroid);
 }