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

chrome/browser/autofill/android/personal_data_manager_android.h

Index: chrome/browser/autofill/android/personal_data_manager_android.h
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.h b/chrome/browser/autofill/android/personal_data_manager_android.h
index c6d15c79fb8220d5176a4cf19df27db9c1964c4e..2ee56421fc61687a63e9424f857cfe1c0cbf4146 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.h
+++ b/chrome/browser/autofill/android/personal_data_manager_android.h
@@ -28,6 +28,7 @@ class PersonalDataManagerAndroid
   class Delegate {
    public:
     virtual void OnRulesSuccessfullyLoaded() = 0;
+    virtual ~Delegate() {}
   };
 
   PersonalDataManagerAndroid(JNIEnv* env, jobject obj);
@@ -298,7 +299,7 @@ class PersonalDataManagerAndroid
       JNIEnv* env);
 
   // Cancels the pending address normalization task.
-  void CancelPendingAddressNormalization(
+  void CancelPendingAddressNormalizations(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj);
 
@@ -340,8 +341,8 @@ class PersonalDataManagerAndroid
   // The address validator used to normalize addresses.
   AddressValidator address_validator_;
 
-  // Map associating a region code to a pending normalization.
-  std::map<std::string, Delegate*> pending_normalization_;
+  // Map associating a region code to pending normalizations.
+  std::map<std::string, std::vector<Delegate*>> pending_normalization_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerAndroid);
 };