[Payments] Code Refactoring for the Subkey Request

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 <string>
 #include <vector>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "components/payments/core/address_normalizer_impl.h"
+#include "components/payments/core/subkey_requester.h"
 #include "third_party/libaddressinput/chromium/chrome_address_validator.h"
 
 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,
-      public LoadRulesListener,
       public base::SupportsWeakPtr<PersonalDataManagerAndroid> {
  public:
-  // The interface for the sub-key request.
-  class SubKeyRequestDelegate {
-   public:
-    virtual void OnRulesSuccessfullyLoaded() = 0;
-    virtual ~SubKeyRequestDelegate() {}
-  };
-
   // Registers the JNI bindings for this class.
   static bool Register(JNIEnv* env);
 
   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;
 
@@ skipping 251 matching lines @@
   // --------------------
 
   // Starts loading the address validation rules for the specified
   // |region_code|.
   void LoadRulesForAddressNormalization(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jstring>& region_code);
 
   // Starts loading the rules for the specified |region_code| for the further
-  // sub-key request.
+  // subkey request.
   void LoadRulesForSubKeys(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jstring>& region_code);
 
   // Normalizes the address of the |jprofile| 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. Also
   // defines a time limit for the normalization, in which case the the
   // |jdelegate| will be notified. If the rules are loaded before the timeout,
   // |jdelegate| will receive the normalized profile.
   void StartAddressNormalization(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jobject>& jprofile,
       const base::android::JavaParamRef<jstring>& jregion_code,
       jint jtimeout_seconds,
       const base::android::JavaParamRef<jobject>& jdelegate);
 
   // Checks whether the Autofill PersonalDataManager has profiles.
   jboolean HasProfiles(JNIEnv* env,
                        const base::android::JavaParamRef<jobject>& unused_obj);
 
   // Checks whether the Autofill PersonalDataManager has credit cards.
   jboolean HasCreditCards(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj);
 
-  // Gets the sub-keys for the region with |jregion_code| code, if the
+  // Gets the subkeys for the region with |jregion_code| code, if the
   // |jregion_code| rules have finished loading. Otherwise, sets up a task to
-  // get the sub-keys, when the rules are loaded.
+  // get the subkeys, when the rules are loaded.
   void StartRegionSubKeysRequest(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jstring>& jregion_code,
+      jint jtimeout_seconds,
       const base::android::JavaParamRef<jobject>& jdelegate);
 
-  // Gets the sub-keys of the rule associated with |jregion_code|. Should only
-  // be called when the rules are loaded.
-  base::android::ScopedJavaLocalRef<jobjectArray> GetSubKeys(
-      JNIEnv* env,
-      const std::string& jregion_code);
-
-  // Callback of the sub-keys request.
-  // This is called when the sub-keys are loaded.
-  void OnAddressValidationRulesLoaded(const std::string& region_code,
-                                      bool success) override;
-
-  // Cancels the pending sub-key request task.
+  // Cancels the pending subkey request task.
   void CancelPendingGetSubKeys(
       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 loaded for the specified |region_code|.
-  bool AreRulesLoadedForRegion(const std::string& region_code);
-
   // 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,
@@ skipping 14 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.
   payments::AddressNormalizerImpl address_normalizer_;
 
-  // The address validator used for sub-key request.
-  AddressValidator address_validator_;
-
-  // The region code and the request for the pending sub-key request.
-  std::unique_ptr<SubKeyRequestDelegate> pending_subkey_request_;
-  std::string pending_subkey_region_code_;
+  // Used for subkey request.
+  payments::SubKeyRequester subkey_requester_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerAndroid);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_