[Payments] Code Refactoring for the Subkey Request

chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java

 // Copyright 2016 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.payments;
 
 import android.app.ProgressDialog;
 import android.os.Handler;
 import android.util.Pair;
 
@@ skipping 317 matching lines @@
             // This should be called when all required fields are put in mAddressField.
             setAddressFieldValuesFromCache();
             addAddressFieldsToEditor(
                     mProfile.getCountryCode(), mProfile.getLanguageCode(), adminAreas);
             mEditorDialog.show(mEditor);
         }
     }
 
     /** Requests the list of admin areas. */
     private void loadAdminAreasForCountry(String countryCode) {
-        // Used to check if the callback is called (for time-out).
+        // Used to check if the callback is called (for the cancellation).
         mAdminAreasLoaded = false;
 
-        onAdminAreasLoading();
+        // For the testing case, the time-out is set to 0. In this case, we should not

[sebsg, 2017/05/18 17:50:51]

Nit: "For the testing case" -> "For tests"

[Parastoo, 2017/05/18 20:59:45]

Done.

+        // fetch the admin-areas, and show a text-field instead.
+        // This is to have the tests independent of the network status.
+        if (PersonalDataManager.getInstance().getRequestTimeoutMS() == 0) {
+            onSubKeysReceived(null);
+            return;
+        }
+
         // In each rule, admin area keys are saved under sub-keys of country.
         PersonalDataManager.getInstance().loadRulesForSubKeys(countryCode);
         PersonalDataManager.getInstance().getRegionSubKeys(countryCode, this);
     }
 
-    /** Cancels the request for the list of admin areas. */
-    private void cancelAdminAreasRequest() {
-        if (mAdminAreasLoaded) return;
-        onSubKeysReceived(null);
-        PersonalDataManager.getInstance().cancelPendingGetSubKeys();
-    }
-
     /**
-     * In case the the admin areas are not loaded yet, or the time out is set to 0 for testing,
-     * starts a timer to cancel the request.
-     */
-    public void onAdminAreasLoading() {
-        if (mAdminAreasLoaded) return;
-        // Handler().postDelayed sometimes adds an additional delay to the time-out,
-        // therefore the case for time-out == 0 is checked initially.
-        if (PersonalDataManager.getInstance().getRequestTimeoutMS() == 0) {
-            cancelAdminAreasRequest();
-            return;
-        }
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                cancelAdminAreasRequest();
-            }
-        }, PersonalDataManager.getInstance().getRequestTimeoutMS());
-    }
-
-    /**
      * Adds fields to the editor model based on the country and language code of
      * the profile that's being edited.
      */
     private void addAddressFieldsToEditor(
             String countryCode, String languageCode, String[] adminAreas) {
         mAddressUiComponents =
                 mAutofillProfileBridge.getAddressUiComponents(countryCode, languageCode);
         // In terms of order, country must be the first field.
         mEditor.addField(mCountryField);
         for (int i = 0; i < mAddressUiComponents.size(); i++) {
@@ skipping 34 matching lines @@
 
                 @Override
                 public boolean isLengthMaximum(@Nullable CharSequence value) {
                     return false;
                 }
             };
         }
         return mPhoneValidator;
     }
 }