Merge-60[Payments] Make state combobox def. value work with state abbrv.

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 ab863a74b3254cc36e646dcabafc3beffef840dd..250e9561e23f9a9a8f0053eefd271eb8a62998e2 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
@@ -14,6 +14,7 @@
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/payments/editor_view_controller.h"
 #include "chrome/browser/ui/views/payments/validating_textfield.h"
+#include "components/autofill/core/browser/region_combobox_model.h"
 
 namespace autofill {
 class AutofillProfile;
@@ -126,6 +127,9 @@ class ShippingAddressEditorViewController : public EditorViewController {
   // Identifies whether we tried and failed to load region data.
   bool failed_to_load_region_data_;
 
+  // Owned by the state combobox, which is owned by this object's base class.
+  autofill::RegionComboboxModel* region_model_;
+
   // Updates |countries_| with the content of |model| if it's not null,
   // otherwise use a local model.
   void UpdateCountries(autofill::CountryComboboxModel* model);