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

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

 // Copyright 2017 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.
 
 #import "ios/chrome/browser/ui/payments/address_edit_mediator.h"
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 171 matching lines @@
           initWithCapacity:static_cast<NSUInteger>(countriesVector.size())];
   for (size_t i = 0; i < countriesVector.size(); ++i) {
     if (countriesVector[i].get()) {
       [countries setObject:base::SysUTF16ToNSString(countriesVector[i]->name())
                     forKey:base::SysUTF8ToNSString(
                                countriesVector[i]->country_code())];
     }
   }
   _countries = countries;
 
-  // If an address is being edited and it has a valid country code, the selected
-  // country code is set to that value. Otherwise, it is set to the default
-  // country code.
-  NSString* countryCode =
+  // If an address is being edited and it has is a valid country code or a valid

[macourteau, 2017/07/04 13:53:45]

s/has //

[Moe, 2017/07/04 15:47:06]

Done.

+  // country name for the autofill::ADDRESS_HOME_COUNTRY field, the selected
+  // country code is set to the respective country code. Otherwise, the selected
+  // country code is set to the default country code.
+  NSString* country =
       [self fieldValueFromProfile:_address
                         fieldType:autofill::ADDRESS_HOME_COUNTRY];
-  _selectedCountryCode =
-      countryCode && [_countries objectForKey:countryCode]
-          ? countryCode
-          : base::SysUTF8ToNSString(countryModel.GetDefaultCountryCode());
+
+  if ([countries objectForKey:country]) {
+    _selectedCountryCode = country;
+  } else if ([[countries allKeysForObject:country] count]) {
+    DCHECK(1 == [[countries allKeysForObject:country] count]);

[macourteau, 2017/07/04 13:53:45]

DCHECK -> DCHECK_EQ

[Moe, 2017/07/04 15:47:06]

Done.

+    _selectedCountryCode = [countries allKeysForObject:country][0];
+  } else {
+    _selectedCountryCode =
+        base::SysUTF8ToNSString(countryModel.GetDefaultCountryCode());
+  }
 }
 
 // Queries the region names based on the selected country code.
 - (void)loadRegions {
   _regionDataLoader = base::MakeUnique<RegionDataLoader>(self);
   _regionDataLoader->LoadRegionData(
       base::SysNSStringToUTF8(self.selectedCountryCode),
       _paymentRequest->GetRegionDataLoader());
 }
 
@@ skipping 131 matching lines @@
 // corresponding field value. Returns nil if |profile| is nullptr.
 - (NSString*)fieldValueFromProfile:(autofill::AutofillProfile*)profile
                          fieldType:(autofill::ServerFieldType)fieldType {
   return profile ? base::SysUTF16ToNSString(profile->GetInfo(
                        autofill::AutofillType(fieldType),
                        GetApplicationContext()->GetApplicationLocale()))
                  : nil;
 }
 
 @end