| Index: components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
|
| diff --git a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
|
| index 4c1798845f45ef270ef519a848de4e7cb6dc0d0f..abdc197eb2fce8d1678fd68a17facb073e0288af 100644
|
| --- a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
|
| +++ b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
|
| @@ -458,7 +458,7 @@ class ContentSubresourceFilterDriverFactoryTest
|
|
|
| private:
|
| static bool expected_measure_performance() {
|
| - const double rate = GetPerformanceMeasurementRate();
|
| + const double rate = GetActiveConfiguration().performance_measurement_rate;
|
| // Note: The case when 0 < rate < 1 is not deterministic, don't test it.
|
| EXPECT_TRUE(rate == 0 || rate == 1);
|
| return rate == 1;
|
| @@ -770,7 +770,7 @@ TEST_P(ContentSubresourceFilterDriverFactoryActivationLevelTest,
|
| factory()->AddHostOfURLToWhitelistSet(url);
|
| NavigateAndExpectActivation(
|
| {true}, {GURL(kExampleUrlWithParams)}, NO_REDIRECTS_HIT,
|
| - GetMaximumActivationLevel() == ActivationLevel::DISABLED
|
| + GetActiveConfiguration().activation_level == ActivationLevel::DISABLED
|
| ? ActivationDecision::ACTIVATION_DISABLED
|
| : ActivationDecision::URL_WHITELISTED);
|
| }
|
| @@ -820,7 +820,7 @@ TEST_P(ContentSubresourceFilterDriverFactoryActivationScopeTest,
|
| NavigateAndExpectActivation(
|
| {test_data.url_matches_activation_list}, {GURL(kExampleUrlWithParams)},
|
| expected_pattern,
|
| - GetCurrentActivationScope() == ActivationScope::NO_SITES
|
| + GetActiveConfiguration().activation_scope == ActivationScope::NO_SITES
|
| ? ActivationDecision::ACTIVATION_DISABLED
|
| : ActivationDecision::URL_WHITELISTED);
|
| }
|
| @@ -849,7 +849,7 @@ TEST_P(ContentSubresourceFilterDriverFactoryActivationScopeTest,
|
| RedirectChainMatchPattern expected_pattern = EMPTY;
|
| NavigateAndExpectActivation(
|
| {test_data.url_matches_activation_list}, {GURL(url)}, expected_pattern,
|
| - GetCurrentActivationScope() == ActivationScope::NO_SITES
|
| + GetActiveConfiguration().activation_scope == ActivationScope::NO_SITES
|
| ? ActivationDecision::ACTIVATION_DISABLED
|
| : ActivationDecision::UNSUPPORTED_SCHEME);
|
| }
|
|
|