[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,
+                                   const std::string& language) {
+  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);
+  // This should never happen.
+  if (rule_iterator == rules.end() || !rule_iterator->second)

[sebsg, 2017/07/07 18:05:04]

Instead of saying "this should never happen" I would add a NOT_REACHED(); in the
if before the return.

It gives the same message to the reader but actually makes a crash in debug
builds :)

[Parastoo, 2017/07/10 15:40:20]

As discussed: this can happen if the rules are bad. In this case, we proceed,
and will show a textfield at the end. Therefore, I'll change the comment to
avoid further confusion.

+    return subkeys_codes_names;
 
-  if (rule_iterator == rules.end() || !rule_iterator->second)
-    return std::vector<std::string>();
+  auto subkeys_codes = rule_iterator->second->GetSubKeys();
 
-  return rule_iterator->second->GetSubKeys();
+  // If the device language is available, show the names in that language.
+  // Otherwise, show the default names.
+  std::string lang_suffix = "";
+  if (rules.find("data/" + region_code + "--" + language) != rules.end())
+    lang_suffix = "--" + language;  // ex: --fr
+
+  for (auto subkey_code : subkeys_codes) {
+    auto rule = rules.find("data/" + region_code + '/' + subkey_code +
+                           lang_suffix);  // exp: data/CA/QC--fr
+    // This should never happen.

[sebsg, 2017/07/07 18:05:04]

ditto

[Parastoo, 2017/07/10 15:40:20]

Done.

+    if (rule == rules.end() || !rule_iterator->second)
+      continue;
+    auto subkey_name = rule->second->GetName();
+    if (subkey_name.empty())  // For some cases, the name is not available.
+      subkey_name = subkey_code;
+    subkeys_codes_names.push_back(make_pair(subkey_code, subkey_name));
+  }
+  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