Revert of Use dropdown list for admin areas in pr form.

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 3dd7936f27400e510e90e0e3f71b2fe530c58a41..801e8b6c0fe65b5841dea731d4a7ce07e2928241 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.h
+++ b/chrome/browser/autofill/android/personal_data_manager_android.h
@@ -12,25 +12,14 @@
 #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.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> {
+class PersonalDataManagerAndroid : public PersonalDataManagerObserver {
  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);
 
@@ -295,14 +284,7 @@
 
   // 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.
-  void LoadRulesForSubKeys(
+  void LoadRulesForRegion(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jstring>& region_code);
@@ -330,31 +312,6 @@
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj);
 
-  // Gets the sub-keys 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.
-  void StartRegionSubKeysRequest(
-      JNIEnv* env,
-      const base::android::JavaParamRef<jobject>& unused_obj,
-      const base::android::JavaParamRef<jstring>& jregion_code,
-      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 OnAddressRulesLoaded(const std::string& region_code,
-                            bool success) override;
-
-  // Cancels the pending sub-key request task.
-  void CancelPendingGetSubKeys(
-      JNIEnv* env,
-      const base::android::JavaParamRef<jobject>& unused_obj);
-
  private:
   ~PersonalDataManagerAndroid() override;
 
@@ -405,13 +362,6 @@
   // The address validator used to normalize addresses.
   payments::AddressNormalizer 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_;
-
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerAndroid);
 };