components/dom_distiller/standalone/content_extractor.cc - Issue 900223003: components: Provide an unified target to generate components_tests_resources.pak.

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/dom_distiller/standalone/content_extractor.cc

Issue 900223003: components: Provide an unified target to generate components_tests_resources.pak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review Created 5 years, 10 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/dom_distiller/content/distiller_page_web_contents_browsertest.cc ('k') | components/test/run_all_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/dom_distiller/standalone/content_extractor.cc

diff --git a/components/dom_distiller/standalone/content_extractor.cc b/components/dom_distiller/standalone/content_extractor.cc

index 6c0e75bd5884391e189dc628cddddaf1b7a2fea8..1643b12ca84c2625539b558e39b3f4821998d4aa 100644

--- a/components/dom_distiller/standalone/content_extractor.cc

+++ b/components/dom_distiller/standalone/content_extractor.cc

@@ -159,11 +159,12 @@ scoped_ptr<DomDistillerService> CreateDomDistillerService(

scoped_ptr<DistilledPagePrefs>(new DistilledPagePrefs(pref_service))));

}

-void AddComponentsResources() {

+void AddComponentsTestResources() {

base::FilePath pak_file;

base::FilePath pak_dir;

PathService::Get(base::DIR_MODULE, &pak_dir);

- pak_file = pak_dir.Append(FILE_PATH_LITERAL("components_resources.pak"));

+ pak_file =

+ pak_dir.Append(FILE_PATH_LITERAL("components_tests_resources.pak"));

ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(

pak_file, ui::SCALE_FACTOR_NONE);

}

@@ -308,7 +309,7 @@ class ContentExtractor : public ContentBrowserTest {

EnableDNSLookupForThisTest();

}

CHECK(db_dir_.CreateUniqueTempDir());

- AddComponentsResources();

+ AddComponentsTestResources();

}

void TearDownOnMainThread() override { DisableDNSLookupForThisTest(); }