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

chrome/browser/autofill/android/personal_data_manager_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_
 #define CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
@@ skipping 10 matching lines @@
 // therefore a single instance of this wrapper.
 class PersonalDataManagerAndroid
     : public PersonalDataManagerObserver,
       public LoadRulesListener,
       public base::SupportsWeakPtr<PersonalDataManagerAndroid> {
  public:
   // The interface for the normalization request.
   class Delegate {
    public:
     virtual void OnRulesSuccessfullyLoaded() = 0;
+    virtual ~Delegate() {}
   };
 
   PersonalDataManagerAndroid(JNIEnv* env, jobject obj);
 
   // Returns true if personal data manager has loaded the initial data.
   jboolean IsDataLoaded(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj) const;
 
   // These functions act on "web profiles" aka "LOCAL_PROFILE" profiles.
@@ skipping 250 matching lines @@
 
   // Normalizes the address of the profile associated with the |guid| with the
   // rules associates with the |region_code|. Should only be called when the
   // rules have finished loading.
   base::android::ScopedJavaLocalRef<jobject> NormalizeAddress(
       const std::string& guid,
       const std::string& region_code,
       JNIEnv* env);
 
   // Cancels the pending address normalization task.
-  void CancelPendingAddressNormalization(
+  void CancelPendingAddressNormalizations(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj);
 
  private:
   ~PersonalDataManagerAndroid() override;
 
   // Returns the GUIDs of the |profiles| passed as parameter.
   base::android::ScopedJavaLocalRef<jobjectArray> GetProfileGUIDs(
       JNIEnv* env,
       const std::vector<AutofillProfile*>& profiles);
@@ skipping 21 matching lines @@
 
   // Pointer to the java counterpart.
   JavaObjectWeakGlobalRef weak_java_obj_;
 
   // Pointer to the PersonalDataManager for the main profile.
   PersonalDataManager* personal_data_manager_;
 
   // 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_;

[please use gerrit instead, 2016/10/18 17:30:32]

Raw pointers are scary because of possible memory leaks. It looks like
PersonalDataManagerAndroid actually controls the life-cycle of Delegate objects
entirely. Therefore, let's change this data structure to own its own elements
instead. See more explanation about this in .cc file.

std::map<std::string, std::vector<std::unique_ptr<Delegate>>>
pending_normalization_;

[sebsg, 2016/10/18 22:44:32]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerAndroid);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_