[Payment Request] Populates region field if region code/name is valid.

ios/chrome/browser/ui/payments/region_data_loader.mm

Index: ios/chrome/browser/ui/payments/region_data_loader.mm
diff --git a/ios/chrome/browser/ui/payments/region_data_loader.mm b/ios/chrome/browser/ui/payments/region_data_loader.mm
index 39131f3829145ffacc9a0b8e1e1b510eba5b0802..b7a10ba91432e852d321d247f1c67405e91504f6 100644
--- a/ios/chrome/browser/ui/payments/region_data_loader.mm
+++ b/ios/chrome/browser/ui/payments/region_data_loader.mm
@@ -38,12 +38,16 @@ void RegionDataLoader::OnComboboxModelChanged(ui::ComboboxModel* model) {
   if (region_model->IsPendingRegionDataLoad())
     return;
 
-  NSMutableArray<NSString*>* regions = [[NSMutableArray alloc] init];
+  NSMutableDictionary<NSString*, NSString*>* regions =
+      [[NSMutableDictionary alloc] init];
   if (!region_model->failed_to_load_data()) {
     for (int i = 0; i < region_model->GetItemCount(); ++i) {
-      if (!region_model->IsItemSeparatorAt(i))
-        [regions
-            addObject:base::SysUTF16ToNSString(region_model->GetItemAt(i))];
+      if (!region_model->IsItemSeparatorAt(i)) {
+        [regions setObject:base::SysUTF8ToNSString(
+                               region_model->GetRegions()[i].second)

[macourteau, 2017/06/20 16:25:00]

nit: extract |region_model->GetRegions()[i]| (or even region_model->GetRegions()
?)

[Moe, 2017/06/20 18:28:34]

Done.

+                    forKey:base::SysUTF8ToNSString(
+                               region_model->GetRegions()[i].first)];
+      }
     }
   }
   [consumer_ regionDataLoaderDidSucceedWithRegions:regions];