[Payments] Add timeout to the address_normalizer.

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.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.content.Context;
-import android.os.Handler;
 import android.text.TextUtils;
 import android.util.JsonWriter;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.FullCardRequestDelegate;
@@ skipping 100 matching lines @@
         // Update the card's expiration date.
         mCard.setMonth(updatedCard.getMonth());
         mCard.setYear(updatedCard.getYear());
 
         mIsWaitingForFullCardDetails = false;
 
         // Show the loading UI while the address gets normalized.
         mCallback.onInstrumentDetailsLoadingWithoutUI();
 
         // Wait for the billing address normalization before sending the instrument details.
-        if (mIsWaitingForBillingNormalization) {
-            // 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());
-
-            return;
-        } else {
-            sendIntrumentDetails();
-        }
+        if (!mIsWaitingForBillingNormalization) sendInstrumentDetails();
     }
 
     @Override
     public void onAddressNormalized(AutofillProfile profile) {
         if (!mIsWaitingForBillingNormalization) return;
         mIsWaitingForBillingNormalization = false;
 
         // If the normalization finished first, use the normalized address.
         if (profile != null) mBillingAddress = profile;
 
         // Wait for the full card details before sending the instrument details.
-        if (!mIsWaitingForFullCardDetails) sendIntrumentDetails();
+        if (!mIsWaitingForFullCardDetails) sendInstrumentDetails();
     }
 
     @Override
     public void onCouldNotNormalize(AutofillProfile profile) {
         onAddressNormalized(null);
     }
 
     /**
      * Stringify the card details and send the resulting string and the method name to the
      * registered callback.
      */
-    private void sendIntrumentDetails() {
+    private void sendInstrumentDetails() {
         StringWriter stringWriter = new StringWriter();
         JsonWriter json = new JsonWriter(stringWriter);
         try {
             json.beginObject();
 
             json.name("cardholderName").value(mCard.getName());
             json.name("cardNumber").value(mCard.getNumber());
             json.name("expiryMonth").value(mCard.getMonth());
             json.name("expiryYear").value(mCard.getYear());
             json.name("cardSecurityCode").value(mSecurityCode);
@@ skipping 160 matching lines @@
     /** @return The credit card represented by this payment instrument. */
     public CreditCard getCard() {
         return mCard;
     }
 
     /** @return The billing address associated with this credit card. */
     public AutofillProfile getBillingAddress() {
         return mBillingAddress;
     }
 }