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

components/autofill/core/browser/region_combobox_model_unittest.cc

 // 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.
 
 #include "components/autofill/core/browser/region_combobox_model.h"
 
 #include <memory>
 
 #include "base/json/json_writer.h"
 #include "base/memory/ptr_util.h"
@@ skipping 16 matching lines @@
 class RegionComboboxModelTest : public testing::Test {
  public:
   RegionComboboxModelTest()
       : pref_service_(autofill::test::PrefServiceForTesting()) {
     manager_.SetTestingPrefService(pref_service_.get());
     manager_.set_timezone_country_code(kTestCountryCode);
   }
 
   void SetupCombobox(bool source_failure) {
     model_.reset(new RegionComboboxModel(
-        base::WrapUnique(new TestSource(source_failure)),
-        base::WrapUnique(new ::i18n::addressinput::NullStorage),
+        base::MakeUnique<TestSource>(source_failure),
+        base::MakeUnique<::i18n::addressinput::NullStorage>(),
         manager_.app_locale(), kTestCountryCode));
   }
 
   void TearDown() override { manager_.SetTestingPrefService(nullptr); }
 
   RegionComboboxModel* model() { return model_.get(); }
 
  private:
   // The source that returns the region data. Using
   // third_party/libaddressinput/src/cpp/test/testdata_source.h wouldn't help
@@ skipping 38 matching lines @@
   std::unique_ptr<RegionComboboxModel> model_;
 };
 
 // Make sure the two regions returned by the source are properly set in the
 // model.
 TEST_F(RegionComboboxModelTest, QuebecOntarioRegions) {
   SetupCombobox(false);
   EXPECT_EQ(2, model()->GetItemCount());
   EXPECT_EQ(base::ASCIIToUTF16(kQuebec), model()->GetItemAt(0));
   EXPECT_EQ(base::ASCIIToUTF16(kOntario), model()->GetItemAt(1));
+  EXPECT_FALSE(model()->failed_to_load_data());
 }
 
 // Make sure the combo box properly support source failures.
 TEST_F(RegionComboboxModelTest, FailingSource) {
   SetupCombobox(true);
-  EXPECT_EQ(0, model()->GetItemCount());
+  EXPECT_EQ(1, model()->GetItemCount());
+  EXPECT_TRUE(model()->failed_to_load_data());
 }
 
 }  // namespace autofill