[Payments] Added region load failure tolerance and tests to PR editor.

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 18 matching lines @@
   // ::i18n::addressinput::PreloadSupplier, |app_locale| is needed for
   // ::i18n::addressinput::RegionDataBuilder and |country_code| identifies which
   // country's region to load into the model.
   RegionComboboxModel(
       std::unique_ptr<const ::i18n::addressinput::Source> source,
       std::unique_ptr<::i18n::addressinput::Storage> storage,
       const std::string& app_locale,
       const std::string& country_code);
   ~RegionComboboxModel() override;
 
+  bool pending_region_data_load() const { return pending_region_data_load_; }
+  bool failed_to_load_data() const { return failed_to_load_data_; }
+
   // 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;
 
+  // To allow testing failure states.
+  void SetFailureModeForTests(bool failed_to_load_data);
+
+ private:
+  // Start the potentially asynchronous process of loading region data.
+  void LoadRegionData(const std::string& country_code);
+
   // Callback for ::i18n::addressinput::PreloadSupplier::LoadRules
   void RegionDataLoaded(bool success, const std::string&, int rule_count);
 
- private:
   // Whether the region data load failed or not.
-  bool failed_to_load_data_{false};
+  bool failed_to_load_data_;
+
+  // Set to true during region data load, and false otherwise. Whether the load
+  // succeeded or not doesn't affect this value.
+  bool pending_region_data_load_;
 
   // The application locale.
   const std::string app_locale_;
 
   // The callback to give to |region_data_supplier_| for async operations.
   ::i18n::addressinput::scoped_ptr<
       ::i18n::addressinput::PreloadSupplier::Callback>
       region_data_supplier_callback_;
 
   // A supplier of region data.
   ::i18n::addressinput::PreloadSupplier region_data_supplier_;
 
   // List of <code, name> pairs for ADDRESS_HOME_STATE combobox values;
   std::vector<std::pair<std::string, std::string>> regions_;
 
   // 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_