Update from https://crrev.com/327068

base/test/launcher/test_launcher.cc

 // Copyright 2013 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 "base/test/launcher/test_launcher.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
 #endif
 
@@ skipping 132 matching lines @@
   SignalFDWatcher() {
   }
 
   void OnFileCanReadWithoutBlocking(int fd) override {
     fprintf(stdout, "\nCaught signal. Killing spawned test processes...\n");
     fflush(stdout);
 
     KillSpawnedTestProcesses();
 
     // The signal would normally kill the process, so exit now.
-    exit(1);
+    _exit(1);
   }
 
   void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SignalFDWatcher);
 };
 #endif  // defined(OS_POSIX)
 
 // Parses the environment variable var as an Int32.  If it is unset, returns
@@ skipping 139 matching lines @@
     g_live_processes.Get().insert(std::make_pair(process.Handle(),
                                                  command_line));
   }
 
   int exit_code = 0;
   if (!process.WaitForExitWithTimeout(timeout, &exit_code)) {
     *was_timeout = true;
     exit_code = -1;  // Set a non-zero exit code to signal a failure.
 
     // Ensure that the process terminates.
-    KillProcess(process.Handle(), -1, true);
+    process.Terminate(-1, true);
   }
 
   {
     // Note how we grab the log before issuing a possibly broad process kill.
     // Other code parts that grab the log kill processes, so avoid trying
     // to do that twice and trigger all kinds of log messages.
     AutoLock lock(g_live_processes_lock.Get());
 
 #if defined(OS_POSIX)
     if (exit_code != 0) {
@@ skipping 239 matching lines @@
   } else if (print_test_stdio == "always") {
     print_snippet = true;
   } else if (print_test_stdio == "never") {
     print_snippet = false;
   } else {
     LOG(WARNING) << "Invalid value of " << switches::kTestLauncherPrintTestStdio
                  << ": " << print_test_stdio;
   }
   if (print_snippet) {
     std::vector<std::string> snippet_lines;
-    SplitString(result.output_snippet, '\n', &snippet_lines);
+    SplitStringDontTrim(result.output_snippet, '\n', &snippet_lines);
     if (snippet_lines.size() > kOutputSnippetLinesLimit) {
       size_t truncated_size = snippet_lines.size() - kOutputSnippetLinesLimit;
       snippet_lines.erase(
           snippet_lines.begin(),
           snippet_lines.begin() + truncated_size);
       snippet_lines.insert(snippet_lines.begin(), "<truncated>");
     }
     fprintf(stdout, "%s", JoinString(snippet_lines, "\n").c_str());
     fflush(stdout);
   }
@@ skipping 497 matching lines @@
   }
 
   std::string snippet(full_output.substr(run_pos));
   if (end_pos != std::string::npos)
     snippet = full_output.substr(run_pos, end_pos - run_pos);
 
   return snippet;
 }
 
 }  // namespace base