components/dom_distiller/content/test/dom_distiller_js_browsertest.cc - Issue 1075783002: Enable components_browsertests on Android

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/content/test/dom_distiller_js_browsertest.cc

Issue 1075783002: Enable components_browsertests on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix GN build and add java dependency to components/test/DEPS Created 5 years, 8 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/printing/renderer/print_web_view_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/dom_distiller/content/test/dom_distiller_js_browsertest.cc

diff --git a/components/dom_distiller/content/test/dom_distiller_js_browsertest.cc b/components/dom_distiller/content/test/dom_distiller_js_browsertest.cc

index 53b37b6639d48a9b2b0482dcd44093a48cae94c7..6d26962ac9340a5bbe6c5628c573948bfbc503ae 100644

--- a/components/dom_distiller/content/test/dom_distiller_js_browsertest.cc

+++ b/components/dom_distiller/content/test/dom_distiller_js_browsertest.cc

@@ -76,8 +76,14 @@ class DomDistillerJsTest : public content::ContentBrowserTest {

void AddComponentsResources() {

base::FilePath pak_file;

base::FilePath pak_dir;

+#if defined(OS_ANDROID)

+ CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_dir));

+ pak_dir = pak_dir.Append(FILE_PATH_LITERAL("paks"));

+#else

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

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

+#endif // OS_ANDROID

+ pak_file =

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

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

pak_file, ui::SCALE_FACTOR_NONE);

}