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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PAYMENTS_SHIPPING_ADDRESS_EDITOR_VIEW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_SHIPPING_ADDRESS_EDITOR_VIEW_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #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;
 class CountryComboboxModel;
 }  // namespace autofill
 
 namespace payments {
 
 class PaymentRequestSpec;
 class PaymentRequestState;
@@ skipping 92 matching lines @@
   // |chosen_country_index_|.
   size_t chosen_country_index_;
 
   // 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_;
 
+  // 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);
 
   // Updates |editor_fields_| based on the current country.
   void UpdateEditorFields();
 
   // Called when data changes need to force a view update. |synchronous|
   // specifies whether the view update can be done synchronously.
   void OnDataChanged(bool synchronous);
 
   // Saves the current state of the |editor_fields_| in |profile| and ignore
   // errors if |ignore_errors| is true. Return false on errors, ignored or not.
   bool SaveFieldsToProfile(autofill::AutofillProfile* profile,
                            bool ignore_errors);
 
   // When a combobox model has changed, a view update might be needed, e.g., if
   // there is no data in the combobox and it must be converted to a text field.
   void OnComboboxModelChanged(views::Combobox* combobox);
 
   // Failed to fetch the region data in time.
   void RegionDataLoadTimedOut();
 
   DISALLOW_COPY_AND_ASSIGN(ShippingAddressEditorViewController);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_SHIPPING_ADDRESS_EDITOR_VIEW_CONTROLLER_H_