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

components/autofill/core/browser/region_combobox_model.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 COMPONENTS_AUTOFILL_CORE_BROWSER_REGION_COMBOBOX_MODEL_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_REGION_COMBOBOX_MODEL_H_
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 25 matching lines @@
   void LoadRegionData(const std::string& country_code,
                       RegionDataLoader* region_data_loader,
                       int64_t timeout_ms);
 
   bool IsPendingRegionDataLoad() const {
     return region_data_loader_ != nullptr;
   }
 
   bool failed_to_load_data() const { return failed_to_load_data_; }
 
+  const std::vector<std::pair<std::string, std::string>>& GetRegions() const {
+    return regions_;
+  }
+
   // ui::ComboboxModel implementation:
   int GetItemCount() const override;
   base::string16 GetItemAt(int index) override;
   bool IsItemSeparatorAt(int index) override;
   void AddObserver(ui::ComboboxModelObserver* observer) override;
   void RemoveObserver(ui::ComboboxModelObserver* observer) override;
 
  private:
   // Callback for the RegionDataLoader.
   void OnRegionDataLoaded(
@@ skipping 11 matching lines @@
 
   // To be called when the data for the given country code was loaded.
   base::ObserverList<ui::ComboboxModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(RegionComboboxModel);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_REGION_COMBOBOX_MODEL_H_