[Payments] Add timeout to the address_normalizer.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentResponseHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentResponseHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentResponseHelper.java
index 208630930c588fbf583dfd6855bfef2bd94acd89..48734ac2ce88fd509d5ccd5d44e620079acd727f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentResponseHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentResponseHelper.java
@@ -4,8 +4,6 @@
 
 package org.chromium.chrome.browser.payments;
 
-import android.os.Handler;
-
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.NormalizedAddressRequestDelegate;
@@ -85,24 +83,8 @@ public class PaymentResponseHelper implements NormalizedAddressRequestDelegate {
             mIsWaitingForShippingNormalization = true;
             PersonalDataManager.getInstance().normalizeAddress(
                     mSelectedShippingAddress.getProfile().getGUID(),
-                    AutofillAddress.getCountryCode(mSelectedShippingAddress.getProfile()), this);
-        }
-    }
-
-    /**
-     * Called when the intrument details have started loading. Starts a timeout to stop the shipping
-     * address normalization if it takes too long.
-     */
-    public void onInstrumentsDetailsLoading() {
-        if (mIsWaitingForShippingNormalization) {
-            // If the normalization is not completed yet, start a timer to cancel it if it takes too
-            // long.
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    onAddressNormalized(null);
-                }
-            }, PersonalDataManager.getInstance().getNormalizationTimeoutMS());
+                    AutofillAddress.getCountryCode(mSelectedShippingAddress.getProfile()),
+                    PersonalDataManager.getInstance().getNormalizationTimeoutSeconds(), this);
         }
     }