diff options
Diffstat (limited to 'chromium/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc')
-rw-r--r-- | chromium/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chromium/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc b/chromium/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc index 3d5fc205b3d..99fe6375c41 100644 --- a/chromium/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc +++ b/chromium/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc @@ -513,9 +513,9 @@ TEST_F(SiteSettingsHandlerTest, MAYBE_GetAllSites) { base::ListValue get_all_sites_args; get_all_sites_args.AppendString(kCallbackId); base::Value category_list(base::Value::Type::LIST); - category_list.GetList().emplace_back(kNotifications); - category_list.GetList().emplace_back(kFlash); - get_all_sites_args.GetList().push_back(std::move(category_list)); + category_list.Append(kNotifications); + category_list.Append(kFlash); + get_all_sites_args.Append(std::move(category_list)); // Test all sites is empty when there are no preferences. handler()->HandleGetAllSites(&get_all_sites_args); @@ -527,7 +527,7 @@ TEST_F(SiteSettingsHandlerTest, MAYBE_GetAllSites) { EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - const base::Value::ListStorage& site_groups = data.arg3()->GetList(); + base::span<const base::Value> site_groups = data.arg3()->GetList(); EXPECT_EQ(0UL, site_groups.size()); } @@ -549,12 +549,12 @@ TEST_F(SiteSettingsHandlerTest, MAYBE_GetAllSites) { EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - const base::Value::ListStorage& site_groups = data.arg3()->GetList(); + base::span<const base::Value> site_groups = data.arg3()->GetList(); EXPECT_EQ(1UL, site_groups.size()); for (const base::Value& site_group : site_groups) { const std::string& etld_plus1_string = site_group.FindKey("etldPlus1")->GetString(); - const base::Value::ListStorage& origin_list = + base::span<const base::Value> origin_list = site_group.FindKey("origins")->GetList(); EXPECT_EQ("example.com", etld_plus1_string); EXPECT_EQ(2UL, origin_list.size()); @@ -578,12 +578,12 @@ TEST_F(SiteSettingsHandlerTest, MAYBE_GetAllSites) { EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - const base::Value::ListStorage& site_groups = data.arg3()->GetList(); + base::span<const base::Value> site_groups = data.arg3()->GetList(); EXPECT_EQ(2UL, site_groups.size()); for (const base::Value& site_group : site_groups) { const std::string& etld_plus1_string = site_group.FindKey("etldPlus1")->GetString(); - const base::Value::ListStorage& origin_list = + base::span<const base::Value> origin_list = site_group.FindKey("origins")->GetList(); if (etld_plus1_string == "example2.net") { EXPECT_EQ(1UL, origin_list.size()); @@ -617,7 +617,7 @@ TEST_F(SiteSettingsHandlerTest, MAYBE_GetAllSites) { EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - const base::Value::ListStorage& site_groups = data.arg3()->GetList(); + base::span<const base::Value> site_groups = data.arg3()->GetList(); EXPECT_EQ(3UL, site_groups.size()); } @@ -631,7 +631,7 @@ TEST_F(SiteSettingsHandlerTest, MAYBE_GetAllSites) { EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - const base::Value::ListStorage& site_groups = data.arg3()->GetList(); + base::span<const base::Value> site_groups = data.arg3()->GetList(); EXPECT_EQ(2UL, site_groups.size()); EXPECT_EQ("example.com", site_groups[0].FindKey("etldPlus1")->GetString()); EXPECT_EQ("example2.net", site_groups[1].FindKey("etldPlus1")->GetString()); @@ -660,7 +660,7 @@ TEST_F(SiteSettingsHandlerTest, MAYBE_GetAllSites) { EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - const base::Value::ListStorage& site_groups = data.arg3()->GetList(); + base::span<const base::Value> site_groups = data.arg3()->GetList(); EXPECT_EQ(2UL, site_groups.size()); EXPECT_EQ("example.com", site_groups[0].FindKey("etldPlus1")->GetString()); EXPECT_EQ("example2.net", site_groups[1].FindKey("etldPlus1")->GetString()); @@ -689,7 +689,7 @@ TEST_F(SiteSettingsHandlerTest, MAYBE_GetAllSites) { EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - const base::Value::ListStorage& site_groups = data.arg3()->GetList(); + base::span<const base::Value> site_groups = data.arg3()->GetList(); EXPECT_EQ(2UL, site_groups.size()); EXPECT_EQ("example.com", site_groups[0].FindKey("etldPlus1")->GetString()); EXPECT_EQ("example2.net", site_groups[1].FindKey("etldPlus1")->GetString()); |