[Payments] Normalize billing address before sending to the merchant.

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 743 matching lines @@
      *
      * @return Whether the normalization will happen asynchronously.
      */
     public boolean normalizeAddress(
             String guid, String regionCode, NormalizedAddressRequestDelegate delegate) {
         ThreadUtils.assertOnUiThread();
         return nativeStartAddressNormalization(
                 mPersonalDataManagerAndroid, guid, regionCode, delegate);
     }
 
-    /** Cancels the pending address normalization. */
-    public void cancelPendingAddressNormalization() {
+    /** Cancels the pending address normalizations. */
+    public void cancelPendingAddressNormalizations() {
         ThreadUtils.assertOnUiThread();
-        nativeCancelPendingAddressNormalization(mPersonalDataManagerAndroid);
+        nativeCancelPendingAddressNormalizations(mPersonalDataManagerAndroid);
     }
 
     /**
      * @return Whether the Autofill feature is enabled.
      */
     public static boolean isAutofillEnabled() {
         return nativeIsAutofillEnabled();
     }
 
     /**
@@ skipping 87 matching lines @@
             String guid);
     private native long nativeGetCurrentDateForTesting(long nativePersonalDataManagerAndroid);
     private native void nativeClearUnmaskedCache(
             long nativePersonalDataManagerAndroid, String guid);
     private native void nativeGetFullCardForPaymentRequest(long nativePersonalDataManagerAndroid,
             WebContents webContents, CreditCard card, FullCardRequestDelegate delegate);
     private native void nativeLoadRulesForRegion(
             long nativePersonalDataManagerAndroid, String regionCode);
     private native boolean nativeStartAddressNormalization(long nativePersonalDataManagerAndroid,
             String guid, String regionCode, NormalizedAddressRequestDelegate delegate);
-    private native void nativeCancelPendingAddressNormalization(
+    private native void nativeCancelPendingAddressNormalizations(
             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);
 }