components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc - Issue 2556433003: Support optional performance measuring in SubresourceFilter.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2556433003: Support optional performance measuring in SubresourceFilter. (Closed)

Patch Set: Link TODO to a bug. Created 4 years 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.cc ('k') | components/subresource_filter/content/common/subresource_filter_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0465ae486f4db75450efb53decf71f7339b7b896..c2b24107f6b5516a07423924ba9879c9a65c77d4 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

@@ -142,7 +142,8 @@ class MockSubresourceFilterDriver : public ContentSubresourceFilterDriver {

~MockSubresourceFilterDriver() override = default;

- MOCK_METHOD2(ActivateForProvisionalLoad, void(ActivationState, const GURL&));

+ MOCK_METHOD3(ActivateForProvisionalLoad,

+ void(ActivationState, const GURL&, bool));

private:

DISALLOW_COPY_AND_ASSIGN(MockSubresourceFilterDriver);

@@ -233,7 +234,7 @@ class ContentSubresourceFilterDriverFactoryTest

rfh_tester->SimulateRedirect(url);

}

EXPECT_CALL(*driver(),

- ActivateForProvisionalLoad(::testing::_, ::testing::_))

+ ActivateForProvisionalLoad(::testing::_, ::testing::_, true))

.Times(expected_activation);

if (!content::IsBrowserSideNavigationEnabled()) {

factory()->ReadyToCommitNavigationInternal(main_rfh(),

@@ -260,7 +261,7 @@ class ContentSubresourceFilterDriverFactoryTest

void NavigateAndCommitSubframe(const GURL& url, bool expected_activation) {

EXPECT_CALL(*subframe_driver(),

- ActivateForProvisionalLoad(::testing::_, ::testing::_))

+ ActivateForProvisionalLoad(::testing::_, ::testing::_, true))

.Times(expected_activation);

EXPECT_CALL(*client(), ToggleNotificationVisibility(::testing::_)).Times(0);

@@ -307,8 +308,8 @@ class ContentSubresourceFilterDriverFactoryTest

NavigateAndExpectActivation(blacklisted_urls, {GURL(kExampleUrl)},

extected_pattern, expected_activation);

- EXPECT_CALL(*driver(),

- ActivateForProvisionalLoad(::testing::_, ::testing::_))

+ EXPECT_CALL(*driver(), ActivateForProvisionalLoad(

+ ::testing::_, ::testing::_, ::testing::_))

.Times(0);

EXPECT_CALL(*client(), ToggleNotificationVisibility(::testing::_)).Times(1);

content::RenderFrameHostTester::For(main_rfh())