[Payments] Show admin area complete names on 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"
@@ skipping 42 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) {
+std::vector<std::pair<std::string, std::string>>
+AddressValidator::GetRegionSubKeys(const std::string& region_code) {
+  std::vector<std::pair<std::string, std::string>> subkeys_codes_names;
   if (!AreRulesLoadedForRegion(region_code))
-    return std::vector<std::string>();
+    return subkeys_codes_names;
 
   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>();
+  std::string code_prefix = "data/" + region_code + "/";
+  size_t code_prefix_size = code_prefix.size();

[Mathieu, 2017/07/05 16:07:15]

nit: code_prefix_size = region_code.size() + 6;   // 6 is the size of "data/"
and the trailing "/"

[Parastoo, 2017/07/07 15:53:23]

Done.

 
-  return rule_iterator->second->GetSubKeys();
+  for (auto r : rules) {
+    if (r.first.size() <= code_prefix_size)

[Mathieu, 2017/07/05 16:07:15]

Could we get in a situation where the key is data/CA/QC--fr (e.g.,
https://chromium-i18n-canary.appspot.com/ssl-aggregate-address/data/CA/QC--fr)
or this will never happen here

[Parastoo, 2017/07/07 15:53:23]

Done.

+      continue;
+    subkeys_codes_names.push_back(
+        std::make_pair(r.first.substr(code_prefix_size), r.second->GetName()));
+  }
+  return subkeys_codes_names;
 }
 
 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 83 matching lines @@
                             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