Payment request shipping address editor now properly handles countries

chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h

Index: chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h
diff --git a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h
index e9be3ef76c25bd2fd2dd7ff0eef93cc2683fc4ef..6caf560357acbf7b61dcac6be5c9eca28c2d8520 100644
--- a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h
+++ b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/macros.h"
@@ -108,8 +109,9 @@ class ShippingAddressEditorViewController : public EditorViewController {
   // have the default country at the top as well as within the sorted list.
   size_t chosen_country_index_;
 
-  // The list of country codes as ordered in the country combobox model.
-  std::vector<std::string> country_codes_;
+  // The list of country codes and names as ordered in the country combobox
+  // model.
+  std::vector<std::pair<std::string, base::string16>> countries_;
 
   // Identifies whether we tried and failed to load region data.
   bool failed_to_load_region_data_;