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

third_party/libaddressinput/chromium/chrome_address_validator.cc

 // Copyright 2014 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.
 
 #include "third_party/libaddressinput/chromium/chrome_address_validator.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "third_party/libaddressinput/chromium/addressinput_util.h"
 #include "third_party/libaddressinput/chromium/input_suggester.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_normalizer.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/source.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/storage.h"
-#include "third_party/libaddressinput/src/cpp/src/rule.h"
 
 namespace autofill {
 namespace {
 
 using ::i18n::addressinput::AddressData;
 using ::i18n::addressinput::AddressField;
 using ::i18n::addressinput::AddressNormalizer;
 using ::i18n::addressinput::BuildCallback;
 using ::i18n::addressinput::FieldProblemMap;
 using ::i18n::addressinput::PreloadSupplier;
-using ::i18n::addressinput::Rule;
 using ::i18n::addressinput::Source;
 using ::i18n::addressinput::Storage;
 
 using ::i18n::addressinput::ADMIN_AREA;
 using ::i18n::addressinput::DEPENDENT_LOCALITY;
 using ::i18n::addressinput::POSTAL_CODE;
 
 // The maximum number attempts to load rules.
 static const int kMaxAttemptsNumber = 8;
 
@@ skipping 11 matching lines @@
       load_rules_listener_(load_rules_listener),
       weak_factory_(this) {}
 
 AddressValidator::~AddressValidator() {}
 
 void AddressValidator::LoadRules(const std::string& region_code) {
   attempts_number_[region_code] = 0;
   supplier_->LoadRules(region_code, *rules_loaded_);
 }
 
-std::vector<std::string> AddressValidator::GetRegionSubKeys(
-    const std::string& region_code) {
-  if (!AreRulesLoadedForRegion(region_code))
-    return std::vector<std::string>();
-
-  auto rules = supplier_->GetRulesForRegion(region_code);
-  auto rule_iterator = rules.find("data/" + region_code);
-
-  if (rule_iterator == rules.end() || !rule_iterator->second)
-    return std::vector<std::string>();
-
-  return rule_iterator->second->GetSubKeys();
-}
-
 AddressValidator::Status AddressValidator::ValidateAddress(
     const AddressData& address,
     const FieldProblemMap* filter,
     FieldProblemMap* problems) const {
   if (supplier_->IsPending(address.region_code)) {
     if (problems)
       addressinput::ValidateRequiredFields(address, filter, problems);
     return RULES_NOT_READY;
   }
 
@@ skipping 63 matching lines @@
 void AddressValidator::Validated(bool success,
                                  const AddressData&,
                                  const FieldProblemMap&) {
   DCHECK(success);
 }
 
 void AddressValidator::RulesLoaded(bool success,
                                    const std::string& region_code,
                                    int) {
   if (load_rules_listener_)
-    load_rules_listener_->OnAddressRulesLoaded(region_code, success);
+    load_rules_listener_->OnAddressValidationRulesLoaded(region_code, success);
 
   // Count the first failed attempt to load rules as well.
   if (success || attempts_number_[region_code] + 1 >= kMaxAttemptsNumber)
     return;
 
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::Bind(&AddressValidator::RetryLoadRules,
                             weak_factory_.GetWeakPtr(), region_code),
       GetBaseRetryPeriod() * pow(2, attempts_number_[region_code]++));
 }
 
 void AddressValidator::RetryLoadRules(const std::string& region_code) {
   // Do not reset retry count.
   supplier_->LoadRules(region_code, *rules_loaded_);
 }
 
 }  // namespace autofill