[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 74 matching lines @@
                 == AutofillAddress.COMPLETE;
         assert mIsComplete;
         assert mHasValidNumberAndName;
         assert mCallback == null;
         mCallback = callback;
 
         mIsWaitingForBillingNormalization = true;
         mIsWaitingForFullCardDetails = true;
 
         // Start the billing address normalization.
-        PersonalDataManager.getInstance().normalizeAddress(
-                mBillingAddress.getGUID(), AutofillAddress.getCountryCode(mBillingAddress), this);
+        PersonalDataManager.getInstance().normalizeAddress(mBillingAddress.getGUID(),
+                AutofillAddress.getCountryCode(mBillingAddress),
+                PersonalDataManager.getInstance().getNormalizationTimeoutSeconds(), this);
 
         // Start to get the full card details.
         PersonalDataManager.getInstance().getFullCard(mWebContents, mCard, this);
     }
 
     @Override
     public void onFullCardDetails(CreditCard updatedCard, String cvc) {
         // Keep the cvc for after the normalization.
         mSecurityCode = cvc;
 
         // The card number changes for unmasked cards.
         assert updatedCard.getNumber().length() > 4;
         mCard.setNumber(updatedCard.getNumber());
 
         // 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());
+        if (mIsWaitingForBillingNormalization) return;

[please use gerrit instead, 2017/02/21 17:15:12]

Collapse 3 lines into 1:

if (!mIsWaitingForBillingNormalization) sendIntrumentDetails();

[sebsg, 2017/02/21 18:30:59]

Done.

 
-            return;
-        } else {
-            sendIntrumentDetails();
-        }
+        sendIntrumentDetails();

[Mathieu, 2017/02/21 17:40:43]

Instrument?

[sebsg, 2017/02/21 18:30:59]

Done.

     }
 
     @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;
 
@@ skipping 184 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;
     }
 }