Reland: Take 2: Force python test server output to be unbuffered, so it doesn't mix with gtest outpu

content/public/test/browser_test_utils.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/public/test/browser_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 496 matching lines @@
     return false;
   }
 
   started_ = true;
   return true;
 }
 
 CommandLine* TestWebSocketServer::CreatePythonCommandLine() {
   // Note: Python's first argument must be the script; do not append CommandLine
   // switches, as they would precede the script path and break this CommandLine.
-  FilePath path;
-  CHECK(GetPythonRunTime(&path));
-  return new CommandLine(path);
+  CommandLine* cmd_line = new CommandLine(CommandLine::NO_PROGRAM);
+  // TODO(phajdan.jr): Instead of CHECKing, return a boolean indicating success.
+  CHECK(GetPythonCommand(cmd_line));
+  return cmd_line;
 }
 
 void TestWebSocketServer::SetPythonPath() {
   FilePath scripts_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &scripts_path);
 
   scripts_path = scripts_path
       .Append(FILE_PATH_LITERAL("third_party"))
       .Append(FILE_PATH_LITERAL("WebKit"))
       .Append(FILE_PATH_LITERAL("Tools"))
@@ skipping 32 matching lines @@
   base::LaunchProcess(*cmd_line.get(), options, NULL);
 
 #if defined(OS_POSIX)
   // Just to make sure that the server process terminates certainly.
   if (process_group_id_ != base::kNullProcessHandle)
     base::KillProcessGroup(process_group_id_);
 #endif
 }
 
 }  // namespace content