diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-24 14:58:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-03 12:52:49 +0200 |
| commit | 436c803d1aaa5101edfdc9dd1332e4e62f1b85a4 (patch) | |
| tree | 7446331758fd582b623b1b9bbed00e3cb6b58c14 | |
| parent | f2027440d2a3bb302303109913452533d695735e (diff) | |
Fix zygote path used
It was using FILE_EXE which is the application executable not the
subprocess one. Only worked because we returned the subprocess
executable for FILE_EXE.
Change-Id: I0a3c4c9c621ea23df086c13197ff76477097cfb7
| -rw-r--r-- | chromium/services/service_manager/zygote/host/zygote_communication_linux.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/services/service_manager/zygote/host/zygote_communication_linux.cc b/chromium/services/service_manager/zygote/host/zygote_communication_linux.cc index 9e6a5fa3d22..5a0bb5f59a5 100644 --- a/chromium/services/service_manager/zygote/host/zygote_communication_linux.cc +++ b/chromium/services/service_manager/zygote/host/zygote_communication_linux.cc @@ -17,6 +17,7 @@ #include "base/posix/eintr_wrapper.h" #include "base/posix/unix_domain_socket.h" #include "base/stl_util.h" +#include "content/public/common/child_process_host.h" #include "services/service_manager/embedder/result_codes.h" #include "services/service_manager/embedder/switches.h" #include "services/service_manager/sandbox/switches.h" @@ -224,8 +225,8 @@ void ZygoteCommunication::Init( base::OnceCallback<pid_t(base::CommandLine*, base::ScopedFD*)> launcher) { CHECK(!init_); - base::FilePath chrome_path; - CHECK(base::PathService::Get(base::FILE_EXE, &chrome_path)); + base::FilePath chrome_path = content::ChildProcessHost::GetChildPath( + content::ChildProcessHost::CHILD_NORMAL); base::CommandLine cmd_line(chrome_path); cmd_line.AppendSwitchASCII(switches::kProcessType, switches::kZygoteProcess); |