[Payments] Normalize addresses before passing them to merchants.

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 42 matching lines @@
          */
         @CalledByNative("FullCardRequestDelegate")
         void onFullCardDetails(CreditCard card, String cvc);
 
         /**
          * Called when user did not provide full card details.
          */
         @CalledByNative("FullCardRequestDelegate")
         void onFullCardError();
     }
 

[please use gerrit instead, 2016/09/23 09:04:39]

Put NormalizedAddressRequester here.

[sebsg, 2016/09/27 18:48:37]

Done.

     /**
      * Autofill address information.
      */
     public static class AutofillProfile {
         private String mGUID;
         private String mOrigin;
         private boolean mIsLocal;
         private String mFullName;
         private String mCompanyName;
         private String mStreetAddress;
@@ skipping 397 matching lines @@
         if (sManager == null) {
             sManager = new PersonalDataManager();
         }
         return sManager;
     }
 
     private final long mPersonalDataManagerAndroid;
     private final List<PersonalDataManagerObserver> mDataObservers =
             new ArrayList<PersonalDataManagerObserver>();
 
+    // The requester of the address normalization.
+    private NormalizedAddressRequester mRequester;

[please use gerrit instead, 2016/09/23 09:04:39]

Don't save the pointer here. Follow the pattern of FullCardRequestDelegate,
which is passed to native code. See getFullCard() method for example.

[sebsg, 2016/09/27 18:48:37]

Done.

+
     private PersonalDataManager() {
         // Note that this technically leaks the native object, however, PersonalDataManager
         // is a singleton that lives forever and there's no clean shutdown of Chrome on Android
         mPersonalDataManagerAndroid = nativeInit();
     }
 
     /**
      * Called from native when template URL service is done loading.
      */
     @CalledByNative
@@ skipping 220 matching lines @@
         return nativeGetCreditCardUseDateForTesting(mPersonalDataManagerAndroid, guid);
     }
 
     @VisibleForTesting
     long getCurrentDateForTesting() {
         ThreadUtils.assertOnUiThread();
         return nativeGetCurrentDateForTesting(mPersonalDataManagerAndroid);
     }
 
     /**
+     * Starts loading the address validation rules for the specified {@code regionCode}.
+     *
+     * @param regionCode The code of the region for which to load the rules.
+     */
+    public void loadRulesForRegion(String regionCode) {
+        ThreadUtils.assertOnUiThread();
+        nativeLoadRulesForRegion(mPersonalDataManagerAndroid, regionCode);
+    }
+
+    /**
+     * Sets up the task to start normalizing the address of the profile associated with the
+     * specified {@code guid} when the rules associated with the {@code regionCode} are done
+     * loading. After completion, the normalized profile will be sent to the {@code requester}.
+     *
+     * @param guid The GUID of the profile to normalize.
+     * @param regionCode The region code indicating which rules to use for normalization.
+     * @param requester The object requesting the normalization.
+     */
+    public void startAddressNormalizationTask(

[please use gerrit instead, 2016/09/23 09:04:39]

"normalizeAddress()" is a simpler name.

[sebsg, 2016/09/27 18:48:37]

I wanted the name to reflect the fact that it can be async. Would
normalizeAddressAsync() be good?

+            String guid, String regionCode, NormalizedAddressRequester requester) {
+        ThreadUtils.assertOnUiThread();
+        mRequester = requester;
+        nativeStartAddressNormalizationTask(mPersonalDataManagerAndroid, guid, regionCode);
+    }
+
+    /**
+     * Cancels the pending normalization task.
+     */
+    public void cancelAddressNormalizationTask() {

[please use gerrit instead, 2016/09/23 09:04:39]

"cancelPendingAddressNormalization()"

[sebsg, 2016/09/27 18:48:37]

Done.

+        ThreadUtils.assertOnUiThread();
+        if (mRequester != null) {
+            mRequester = null;
+            nativeCancelAddressNormalizationTask(mPersonalDataManagerAndroid);
+        }
+    }
+
+    /**
+     * Called from native when the requested address normalization has been completed.
+     *
+     * @param profile The profile with the normalized address.
+     */
+    @CalledByNative
+    private void onAddressNormalized(AutofillProfile profile) {
+        ThreadUtils.assertOnUiThread();
+        if (mRequester != null) {
+            mRequester.onAddressNormalized(profile);
+            mRequester = null;
+        }
+    }
+
+    /**
      * @return Whether the Autofill feature is enabled.
      */
     public static boolean isAutofillEnabled() {
         return nativeIsAutofillEnabled();
     }
 
     /**
      * Enables or disables the Autofill feature.
      * @param enable True to disable Autofill, false otherwise.
      */
@@ skipping 68 matching lines @@
             long nativePersonalDataManagerAndroid, String guid, int count, long date);
     private native int nativeGetCreditCardUseCountForTesting(long nativePersonalDataManagerAndroid,
             String guid);
     private native long nativeGetCreditCardUseDateForTesting(long nativePersonalDataManagerAndroid,
             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 void nativeStartAddressNormalizationTask(
+            long nativePersonalDataManagerAndroid, String guid, String regionCode);
+    private native void nativeCancelAddressNormalizationTask(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);
 }