[Payments] Move address normalization code from android to native.

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 9973f12f312f3bf62bdcc8385ee630f55effafea..17c44145dba88ea0c2160ef366064c9665d28c57 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.h
+++ b/chrome/browser/autofill/android/personal_data_manager_android.h
@@ -9,10 +9,9 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.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 "components/payments/address_validator_helper.h"
 
 namespace autofill {
 
@@ -20,9 +19,7 @@ namespace autofill {
 // Java layer. Note that on Android, there's only a single profile, and
 // therefore a single instance of this wrapper.
 class PersonalDataManagerAndroid
-    : public PersonalDataManagerObserver,
-      public LoadRulesListener,
-      public base::SupportsWeakPtr<PersonalDataManagerAndroid> {
+    : public PersonalDataManagerObserver {
  public:
   // The interface for the normalization request.
   class Delegate {
@@ -300,36 +297,18 @@ class PersonalDataManagerAndroid
       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;
-
   // Normalizes the address of the profile associated with the |jguid|
   // synchronously if the |jregion_code| rules have finished loading. Otherwise
   // sets up the task to start the address normalization when the rules have
   // finished loading. In either case, sends the normalized profile to the
-  // |jdelegate|. Returns whether the normalization will happen asynchronously.
-  jboolean StartAddressNormalization(
+  // |jdelegate|.
+  void StartAddressNormalization(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jstring>& jguid,
       const base::android::JavaParamRef<jstring>& jregion_code,
       const base::android::JavaParamRef<jobject>& jdelegate);
 
-  // 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 CancelPendingAddressNormalizations(

[please use gerrit instead, 2017/02/14 21:31:08]

Is it OK to remove this functionality?

[sebsg, 2017/02/15 16:18:30]

It was not currently used so I think it's ok to remove now. However, that
feature is required in the long run. I'm thinking of moving the timeout from the
caller to the normalization task itself.

So when asking for a normalization, the caller would specify the time limit
after which it would like to be called back with a non normalized profile. 

Since this is adding some more complex logic, and the current code works as is,
do you mind if I do it in another CL (Starting right now)?

-      JNIEnv* env,
-      const base::android::JavaParamRef<jobject>& unused_obj);
-
   // Checks whether the Autofill PersonalDataManager has profiles.
   jboolean HasProfiles(JNIEnv* env,
                        const base::android::JavaParamRef<jobject>& unused_obj);
@@ -387,11 +366,7 @@ class PersonalDataManagerAndroid
   PersonalDataManager* personal_data_manager_;
 
   // The address validator used to normalize addresses.
-  AddressValidator address_validator_;
-
-  // Map associating a region code to pending normalizations.
-  std::map<std::string, std::vector<std::unique_ptr<Delegate>>>
-      pending_normalization_;
+  payments::AddressValidatorHelper address_validator_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerAndroid);
 };