Skip to content

Commit

Permalink
fix references to zygote_host_linux.cc
Browse files Browse the repository at this point in the history
Commit a042173: ("Move the rest of the core files in chrome\browser
to content\browser.") moved it from chrome/browser/zygote_host_linux.cc
to content/browser/zygote_host_linux.cc.

Commit c2c68b1: ("Add an API around zygoteHost so that chrome doesn't
reach into the internal content implementation.") renamed it from
content/browser/zygote_host_linux.cc to content/browser/zygote_host_impl_linux.cc.

Commit 13d6b3c: ("Move zygote_host_impl_linux.* to content/browser/zygote_host")
moved it into content/browser/zygote_host.

BUG=None

Change-Id: Ie8f8fad945ec53109f67cf53462cd4af01c70d44
Reviewed-on: https://chromium-review.googlesource.com/509248
Commit-Queue: Thiago Farina <tfarina@chromium.org>
Reviewed-by: Ricky Zhou <rickyz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#474641}
  • Loading branch information
tfarina authored and Commit Bot committed May 25, 2017
1 parent 2118f8b commit d4b5141
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion content/zygote/zygote_linux.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ bool Zygote::ProcessRequests() {

if (UsingSUIDSandbox() || UsingNSSandbox()) {
// Let the ZygoteHost know we are ready to go.
// The receiving code is in content/browser/zygote_host_linux.cc.
// The receiving code is in
// content/browser/zygote_host/zygote_host_impl_linux.cc.
bool r = base::UnixDomainSocket::SendMsg(kZygoteSocketPairFd,
kZygoteHelloMessage,
sizeof(kZygoteHelloMessage),
Expand Down
2 changes: 1 addition & 1 deletion docs/linux_zygote.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ randomisation than the browser.

The zygote process is triggered by the `--type=zygote` command line flag, which
causes `ZygoteMain` (in `chrome/browser/zygote_main_linux.cc`) to be run. The
zygote is launched from `chrome/browser/zygote_host_linux.cc`.
zygote is launched from `content/browser/zygote_host/zygote_host_impl_linux.cc`.

Signaling the zygote for a new renderer happens in
`chrome/browser/child_process_launcher.cc`.
Expand Down
8 changes: 4 additions & 4 deletions sandbox/linux/suid/sandbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,10 @@ static bool SetupChildEnvironment() {
unsigned i;

// ld.so may have cleared several environment variables because we are SUID.
// However, the child process might need them so zygote_host_linux.cc saves a
// copy in SANDBOX_$x. This is safe because we have dropped root by this
// point, so we can only exec a binary with the permissions of the user who
// ran us in the first place.
// However, the child process might need them so zygote_host_impl_linux.cc
// saves a copy in SANDBOX_$x. This is safe because we have dropped root by
// this point, so we can only exec a binary with the permissions of the user
// who ran us in the first place.

for (i = 0; kSUIDUnsafeEnvironmentVariables[i]; ++i) {
const char* const envvar = kSUIDUnsafeEnvironmentVariables[i];
Expand Down

0 comments on commit d4b5141

Please sign in to comment.