[Payments] Normalize addresses before passing them to merchants.

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"
+#include "chrome/browser/autofill/validation_rules_storage_factory.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
+#include "third_party/libaddressinput/chromium/chrome_address_validator.h"
+#include "third_party/libaddressinput/chromium/chrome_metadata_source.h"
+#include "third_party/libaddressinput/chromium/chrome_storage_impl.h"

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

Includes for lines 14-16 should go into the *.cc file.

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

The chrome_address_validator has to be there to implement LoadRulesListener but
I moved the others to the .cc file. Thanks.

 
 namespace autofill {
 
 // Android wrapper of the PersonalDataManager which provides access from the
 // Java layer. Note that on Android, there's only a single profile, and
 // therefore a single instance of this wrapper.
-class PersonalDataManagerAndroid : public PersonalDataManagerObserver {
+class PersonalDataManagerAndroid : public PersonalDataManagerObserver,
+                                   public LoadRulesListener {
  public:
   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 212 matching lines @@
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jstring>& jguid);
 
   // Returns the current date represented as an absolute point in coordinated
   // universal time (UTC) represented as microseconds since the Unix epoch. For
   // more details see the comment header in time.h
   jlong GetCurrentDateForTesting(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj);
 

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

// These functions help address normalization.
// --------------------

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

Done.

+  // Starts loading the address validation rules for the specified
+  // |region_code|.
+  void LoadRulesForRegion(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& unused_obj,
+      const base::android::JavaParamRef<jstring>& region_code);
+
+  // Callback of the address validator that is called when the validator has
+  // finished loading the rules for a region.
+  void OnAddressValidationRulesLoaded(const std::string& region_code,
+                                      bool success) override;
+
+  // Sets up the task to start the address normalization of the profile
+  // associated with the specified |jguid| when the rules associated with the
+  // |jregion_code| have finished loading.
+  void StartAddressNormalizationTask(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& unused_obj,
+      const base::android::JavaParamRef<jstring>& jguid,
+      const base::android::JavaParamRef<jstring>& jregion_code);
+
+  // Cancels the pending address normalization task.
+  void CancelAddressNormalizationTask(
+      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);
 
   // Returns the GUIDs of the |credit_cards| passed as parameter.
   base::android::ScopedJavaLocalRef<jobjectArray> GetCreditCardGUIDs(
       JNIEnv* env,
       const std::vector<CreditCard*>& credit_cards);
 
+  // Returns whether the rules are done loading for the specified
+  //|region_code|.
+  bool AreRulesDoneLoadingForRegion(std::string region_code);

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

const std::string& 


... to avoid string copies, which are expensive in C++.

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

Done.

+
+  // Returns whether the rules were successfully loaded for the specified
+  // |region_code|. This should only be called when the rules have finished
+  // loading.
+  bool AreRulesSuccessfullyLoadedForRegion(std::string region_code);

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

const std::string&

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

Done.

+
+  // 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.
+  void NormalizeAddress(std::string guid, std::string region_code);

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

const std::string&

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

Done.

+
   // Gets the labels for the |profiles| passed as parameters. These labels are
   // useful for distinguishing the profiles from one another.
   //
   // The labels never contain the full name and include at least 2 fields.
   //
   // If |address_only| is true, then such fields as phone number, and email
   // address are also omitted, but all other fields are included in the label.
   base::android::ScopedJavaLocalRef<jobjectArray> GetProfileLabels(
       JNIEnv* env,
       bool address_only,
       bool include_name,
       std::vector<AutofillProfile*> profiles);
 
   // Pointer to the java counterpart.
   JavaObjectWeakGlobalRef weak_java_obj_;
 
   // Pointer to the PersonalDataManager for the main profile.
   PersonalDataManager* personal_data_manager_;
 
+  // Pointer to the address validator used to normalize addresses.
+  std::unique_ptr<AddressValidator> address_validator_;
+
+  // Map containing all the regions for which rules were requested along with
+  // a bool indicating if they have finished loading.
+  std::map<std::string, bool> loaded_rules_;
+
+  // The region code of the rules that still loading and necessary for the
+  // pending address normalization.
+  std::string pending_normalization_region_code_ = "";
+
+  // The guid of the profile to normalize when the rules associated with the
+  // |pending_normalization_region_code_| have finished loading.
+  std::string pending_normalization_profile_guid_ = "";
+
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerAndroid);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_