components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc - Issue 2182493009: Framework for indexing of subresource filtering rules.

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/renderer/document_subresource_filter_unittest.cc

Issue 2182493009: Framework for indexing of subresource filtering rules. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Attempt #2 to fix tests on Windows. Created 4 years, 5 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 | « chrome/browser/subresource_filter/subresource_filter_browsertest.cc ('k') | components/subresource_filter/content/renderer/subresource_filter_agent_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc

diff --git a/components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc b/components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc

index b329e36025720c945f13e5c289d6b515e270adaf..deba5c3c85b7fdaabf8aee128d3ab0eb2c74d9cf 100644

--- a/components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc

+++ b/components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc

@@ -4,8 +4,6 @@

#include "components/subresource_filter/content/renderer/document_subresource_filter.h"

-#include <utility>

#include "base/files/file.h"

#include "base/macros.h"

#include "base/memory/ref_counted.h"

@@ -39,11 +37,12 @@ class DocumentSubresourceFilterTest : public ::testing::Test {

}

void SetTestRulesetToDisallowURLsWithPathSuffix(base::StringPiece suffix) {

- base::File ruleset_file;

+ testing::TestRulesetPair test_ruleset_pair;

ASSERT_NO_FATAL_FAILURE(

- test_ruleset_creator_.CreateRulesetFileToDisallowURLsWithPathSuffix(

- suffix, &ruleset_file));

- ruleset_ = new MemoryMappedRuleset(std::move(ruleset_file));

+ test_ruleset_creator_.CreateRulesetToDisallowURLsWithPathSuffix(

+ suffix, &test_ruleset_pair));

+ ruleset_ = new MemoryMappedRuleset(

+ testing::TestRuleset::Open(test_ruleset_pair.indexed));

}

const MemoryMappedRuleset* ruleset() { return ruleset_.get(); }