components/subresource_filter/content/browser/subresource_filter_navigation_throttle_unittests.cc - Issue 2186233003: Introduce activation scope logic.

Unified Diff: components/subresource_filter/content/browser/subresource_filter_navigation_throttle_unittests.cc

Issue 2186233003: Introduce activation scope logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: adressed-comments Created 4 years, 4 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

« no previous file with comments | « components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc ('k') | components/subresource_filter/core/browser/subresource_filter_features.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/subresource_filter/content/browser/subresource_filter_navigation_throttle_unittests.cc

diff --git a/components/subresource_filter/content/browser/subresource_filter_navigation_throttle_unittests.cc b/components/subresource_filter/content/browser/subresource_filter_navigation_throttle_unittests.cc

index cee9d99b5632d45fc8371cc5737d3f4551037cd8..547abb3dcdc814ac33e085c319aace770283cd92 100644

--- a/components/subresource_filter/content/browser/subresource_filter_navigation_throttle_unittests.cc

+++ b/components/subresource_filter/content/browser/subresource_filter_navigation_throttle_unittests.cc

@@ -113,7 +113,8 @@ class SubresourceFilterNavigationThrottleTest

TEST_F(SubresourceFilterNavigationThrottleTest, RequestWithoutRedirects) {

base::FieldTrialList field_trial_list(nullptr);

testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(

- base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled);

+ base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled,

+ kActivationScopeActivationList);

const GURL url(kExampleURL);

SetUpNavigationHandleForURL(url);

@@ -134,7 +135,8 @@ TEST_F(SubresourceFilterNavigationThrottleTest,

RequestWithoutRedirectsNoActivation) {

base::FieldTrialList field_trial_list(nullptr);

testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(

- base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled);

+ base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled,

+ kActivationScopeActivationList);

const GURL url_with_activation(kExampleURL);

const GURL url_without_activation(kTestURL);

@@ -159,7 +161,8 @@ TEST_F(SubresourceFilterNavigationThrottleTest,

RequestToNonWebURLNoActivation) {

base::FieldTrialList field_trial_list(nullptr);

testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(

- base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled);

+ base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled,

+ kActivationScopeActivationList);

const GURL non_web_url(kNonWebURL);

@@ -185,7 +188,8 @@ TEST_F(SubresourceFilterNavigationThrottleTest,

// Test checks that both |url| and |redirect| are in the activation set.

base::FieldTrialList field_trial_list(nullptr);

testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(

- base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled);

+ base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled,

+ kActivationScopeActivationList);

const GURL url(kExampleURL);

const GURL redirect(kRedirectURLFirst);

@@ -215,7 +219,8 @@ TEST_F(SubresourceFilterNavigationThrottleTest,

// are in the activation set.

base::FieldTrialList field_trial_list(nullptr);

testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(

- base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled);

+ base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled,

+ kActivationScopeActivationList);

const GURL url(kExampleURL);

const GURL redirect_after_sb_classification(kTestURL);

@@ -251,7 +256,8 @@ TEST_F(SubresourceFilterNavigationThrottleTest,

RequestRedirectWithMatchRedirectTest) {

base::FieldTrialList field_trial_list(nullptr);

testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(

- base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled);

+ base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationStateEnabled,

+ kActivationScopeActivationList);

const GURL init_url(kExampleURL);

const GURL redirect_with_match(kRedirectURLFirst);