base: Remove the string logging from CHECK().

content/browser/zygote_host/zygote_host_impl_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/zygote_host/zygote_host_impl_linux.h"
 
 #include <sys/socket.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/files/file_enumerator.h"
@@ skipping 144 matching lines @@
     sandbox_host->PrependWrapper(cmd_line);
     sandbox_host->SetupLaunchOptions(&options, &fds_to_map, &dummy_fd);
     sandbox_host->SetupLaunchEnvironment();
   }
 
   options.fds_to_remap = &fds_to_map;
   base::Process process =
       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]);
   control_fd->reset(fds[0]);
 
   pid_t pid = process.Pid();
 
   if (use_namespace_sandbox_ || use_suid_sandbox_) {
     // The namespace and SUID sandbox will execute the zygote in a new
     // PID namespace, and the main zygote process will then fork from
     // there. Watch now our elaborate dance to find and validate the
     // zygote's PID.
 
     // First we receive a message from the zygote boot process.
     base::ProcessId boot_pid;
     CHECK(ReceiveFixedMessage(fds[0], kZygoteBootMessage,
                               sizeof(kZygoteBootMessage), &boot_pid));
 
     // 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.
     pid_t real_pid;
     CHECK(ReceiveFixedMessage(fds[0], kZygoteHelloMessage,
                               sizeof(kZygoteHelloMessage), &real_pid));
     CHECK_GT(real_pid, 1);
 
     if (real_pid != pid) {
       // Reap the sandbox.
@@ skipping 72 matching lines @@
     if (sandbox_helper_process.IsValid())
       base::EnsureProcessGetsReaped(sandbox_helper_process.Pid());
   } else if (!use_suid_sandbox_for_adj_oom_score_) {
     if (!base::AdjustOOMScore(pid, score))
       PLOG(ERROR) << "Failed to adjust OOM score of renderer with pid " << pid;
   }
 }
 #endif
 
 }  // namespace content