components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle_unittest.cc - Issue 2844063002: Add support for multiple simultaneous subresource_filter::Configurations.

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

Issue 2844063002: Add support for multiple simultaneous subresource_filter::Configurations. (Closed)

Patch Set: Rebase. Created 3 years, 7 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

« components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc ('K') | « 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_safe_browsing_activation_throttle_unittest.cc

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

index 6c53c62c38ed5b8da2869541053eb754698094a8..94afb6fd4d63ec4d6452460a09acd74afd3a0165 100644

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

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

@@ -285,7 +285,7 @@ TEST_F(SubresourceFilterSafeBrowsingActivationThrottleTest,

SimulateStartAndExpectProceed();

SimulateCommitAndExpectProceed();

EXPECT_EQ(ContentSubresourceFilterDriverFactory::ActivationDecision::

- ACTIVATION_LIST_NOT_MATCHED,

+ ACTIVATION_CONDITIONS_NOT_MET,

factory()->GetActivationDecisionForLastCommittedPageLoad());

tester().ExpectTotalCount(kMatchesPatternHistogramNameSubresourceFilterSuffix,

0);

@@ -319,7 +319,7 @@ TEST_F(SubresourceFilterSafeBrowsingActivationThrottleTest,

SimulateRedirectAndExpectProceed(GURL(kRedirectURL));

SimulateCommitAndExpectProceed();

EXPECT_EQ(ContentSubresourceFilterDriverFactory::ActivationDecision::

- ACTIVATION_LIST_NOT_MATCHED,

+ ACTIVATION_CONDITIONS_NOT_MET,

factory()->GetActivationDecisionForLastCommittedPageLoad());

tester().ExpectTotalCount(kMatchesPatternHistogramNameSubresourceFilterSuffix,

0);

@@ -361,7 +361,7 @@ TEST_F(SubresourceFilterSafeBrowsingActivationThrottleTest,

test_io_task_runner()->FastForwardBy(expected_delay);

SimulateCommitAndExpectProceed();

EXPECT_EQ(ContentSubresourceFilterDriverFactory::ActivationDecision::

- ACTIVATION_LIST_NOT_MATCHED,

+ ACTIVATION_CONDITIONS_NOT_MET,

factory()->GetActivationDecisionForLastCommittedPageLoad());

tester().ExpectTotalCount(kMatchesPatternHistogramNameSubresourceFilterSuffix,

0);

@@ -438,7 +438,7 @@ TEST_F(SubresourceFilterSafeBrowsingActivationThrottleTest,

SimulateCommitAndExpectProceed();

EXPECT_EQ(ContentSubresourceFilterDriverFactory::ActivationDecision::

- ACTIVATION_LIST_NOT_MATCHED,

+ ACTIVATION_CONDITIONS_NOT_MET,

factory()->GetActivationDecisionForLastCommittedPageLoad());

tester().ExpectTotalCount(kMatchesPatternHistogramNameSubresourceFilterSuffix,

0);