Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(649)

Unified Diff: components/subresource_filter/core/browser/subresource_filter_features_unittest.cc

Issue 2831373002: Introduce subresource_filter::ConfigurationList and make querying it cheap. (Closed)
Patch Set: Rebase. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/subresource_filter/core/browser/subresource_filter_features_unittest.cc
diff --git a/components/subresource_filter/core/browser/subresource_filter_features_unittest.cc b/components/subresource_filter/core/browser/subresource_filter_features_unittest.cc
index 204186832d2d58f8220dc7a278490fef605f6438..86ba034c785ef6fbfc446d5c302bde6c63a3d95d 100644
--- a/components/subresource_filter/core/browser/subresource_filter_features_unittest.cc
+++ b/components/subresource_filter/core/browser/subresource_filter_features_unittest.cc
@@ -42,7 +42,9 @@ TEST(SubresourceFilterFeaturesTest, ActivationLevel) {
: base::FeatureList::OVERRIDE_USE_DEFAULT,
test_case.activation_level_param, kActivationScopeNoSites);
- Configuration actual_configuration = GetActiveConfiguration();
+ auto active_configurations = GetActiveConfigurations();
Sorin Jianu 2017/04/24 21:58:59 can this be const, here and below?
engedy 2017/04/25 08:34:24 Yep, done.
+ const Configuration& actual_configuration =
+ active_configurations->the_one_and_only();
EXPECT_EQ(test_case.expected_activation_level,
actual_configuration.activation_level);
EXPECT_EQ(ActivationScope::NO_SITES, actual_configuration.activation_scope);
@@ -79,7 +81,9 @@ TEST(SubresourceFilterFeaturesTest, ActivationScope) {
: base::FeatureList::OVERRIDE_USE_DEFAULT,
kActivationLevelDisabled, test_case.activation_scope_param);
- Configuration actual_configuration = GetActiveConfiguration();
+ auto active_configurations = GetActiveConfigurations();
+ const Configuration& actual_configuration =
+ active_configurations->the_one_and_only();
EXPECT_EQ(ActivationLevel::DISABLED, actual_configuration.activation_level);
EXPECT_EQ(test_case.expected_activation_scope,
actual_configuration.activation_scope);
@@ -130,7 +134,9 @@ TEST(SubresourceFilterFeaturesTest, ActivationLevelAndScope) {
: base::FeatureList::OVERRIDE_USE_DEFAULT,
test_case.activation_level_param, test_case.activation_scope_param);
- Configuration actual_configuration = GetActiveConfiguration();
+ auto active_configurations = GetActiveConfigurations();
+ const Configuration& actual_configuration =
+ active_configurations->the_one_and_only();
EXPECT_EQ(test_case.expected_activation_level,
actual_configuration.activation_level);
EXPECT_EQ(test_case.expected_activation_scope,
@@ -186,7 +192,9 @@ TEST(SubresourceFilterFeaturesTest, ActivationList) {
kActivationLevelDisabled, kActivationScopeNoSites,
test_case.activation_list_param);
- Configuration actual_configuration = GetActiveConfiguration();
+ auto active_configurations = GetActiveConfigurations();
+ const Configuration& actual_configuration =
+ active_configurations->the_one_and_only();
EXPECT_EQ(test_case.expected_activation_list,
actual_configuration.activation_list);
}
@@ -223,7 +231,9 @@ TEST(SubresourceFilterFeaturesTest, PerfMeasurementRate) {
{{kPerformanceMeasurementRateParameterName,
test_case.perf_measurement_param}});
- Configuration actual_configuration = GetActiveConfiguration();
+ auto active_configurations = GetActiveConfigurations();
+ const Configuration& actual_configuration =
+ active_configurations->the_one_and_only();
EXPECT_EQ(test_case.expected_perf_measurement_rate,
actual_configuration.performance_measurement_rate);
}
@@ -257,7 +267,9 @@ TEST(SubresourceFilterFeaturesTest, SuppressNotifications) {
{{kSuppressNotificationsParameterName,
test_case.suppress_notifications_param}});
- Configuration actual_configuration = GetActiveConfiguration();
+ auto active_configurations = GetActiveConfigurations();
+ const Configuration& actual_configuration =
+ active_configurations->the_one_and_only();
EXPECT_EQ(test_case.expected_suppress_notifications_value,
actual_configuration.should_suppress_notifications);
}
@@ -291,7 +303,9 @@ TEST(SubresourceFilterFeaturesTest, WhitelistSiteOnReload) {
{{kWhitelistSiteOnReloadParameterName,
test_case.whitelist_site_on_reload_param}});
- Configuration actual_configuration = GetActiveConfiguration();
+ auto active_configurations = GetActiveConfigurations();
+ const Configuration& actual_configuration =
+ active_configurations->the_one_and_only();
EXPECT_EQ(test_case.expected_whitelist_site_on_reload_value,
actual_configuration.should_whitelist_site_on_reload);
}

Powered by Google App Engine
This is Rietveld 408576698