components/nacl/zygote/nacl_fork_delegate_linux.cc - Issue 676323002: Non-SFI mode: Add --use-nacl-helper-nonsfi flag.

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/nacl/zygote/nacl_fork_delegate_linux.cc

Issue 676323002: Non-SFI mode: Add --use-nacl-helper-nonsfi flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 2 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:

Index: components/nacl/zygote/nacl_fork_delegate_linux.cc

diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.cc b/components/nacl/zygote/nacl_fork_delegate_linux.cc

index 5a67af07cf64cb3056b92c7be5202050e1435ace..2b13cfbe830f04c143af94a92724f4cad3221349 100644

--- a/components/nacl/zygote/nacl_fork_delegate_linux.cc

+++ b/components/nacl/zygote/nacl_fork_delegate_linux.cc

@@ -188,7 +188,9 @@ void NaClForkDelegate::Init(const int sandboxdesc,

status_ = kNaClHelperUnused;

base::FilePath helper_exe;

base::FilePath helper_bootstrap_exe;

- if (!PathService::Get(nacl::FILE_NACL_HELPER, &helper_exe)) {

+ if (!PathService::Get(

+ nonsfi_mode_ ? nacl::FILE_NACL_HELPER_NONSFI : nacl::FILE_NACL_HELPER,

+ &helper_exe)) {

status_ = kNaClHelperMissing;

} else if (use_nacl_bootstrap &&

!PathService::Get(nacl::FILE_NACL_HELPER_BOOTSTRAP,