Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Unified Diff: content/browser/zygote_host/zygote_host_impl_linux.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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
Index: content/browser/zygote_host/zygote_host_impl_linux.cc
diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
index 38b8cf6b3b584322b5b24022216c43e2928f0c5f..cab7d40c2caed0392e4767c560d3d88af67f8064 100644
--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
@@ -162,7 +162,8 @@ pid_t ZygoteHostImpl::LaunchZygote(base::CommandLine* cmd_line,
use_namespace_sandbox_
? sandbox::NamespaceSandbox::LaunchProcess(*cmd_line, options)
: base::LaunchProcess(*cmd_line, options);
- CHECK(process.IsValid()) << "Failed to launch zygote process";
+ // Failed to launch zygote process
+ CHECK(process.IsValid());
dummy_fd.reset();
close(fds[1]);
@@ -184,10 +185,9 @@ pid_t ZygoteHostImpl::LaunchZygote(base::CommandLine* cmd_line,
// Within the PID namespace, the zygote boot process thinks it's PID 1,
// but its real PID can never be 1. This gives us a reliable test that
// the kernel is translating the sender's PID to our namespace.
- CHECK_GT(boot_pid, 1)
- << "Received invalid process ID for zygote; kernel might be too old? "
- "See crbug.com/357670 or try using --"
- << switches::kNoSandbox << " to workaround.";
+ // If this fails, the kernel might be too old? See crbug.com/357670 or try
+ // using --no-sandbox to workaround.
+ CHECK_GT(boot_pid, 1);
// Now receive the message that the zygote's ready to go, along with the
// main zygote process's ID.

Powered by Google App Engine
This is Rietveld 408576698