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

net/test/local_test_server_win.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 "net/test/local_test_server.h"
 
 #include <windows.h>
 #include <wincrypt.h>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
+#include "net/test/python_utils.h"
 
 #pragma comment(lib, "crypt32.lib")
 
 namespace {
 
 // Writes |size| bytes to |handle| and sets |*unblocked| to true.
 // Used as a crude timeout mechanism by ReadData().
 void UnblockPipe(HANDLE handle, DWORD size, bool* unblocked) {
   std::string unblock_data(size, '\0');
   // Unblock the ReadFile in LocalTestServer::WaitToStart by writing to the
@@ skipping 45 matching lines @@
   }
 
   return true;
 }
 
 }  // namespace
 
 namespace net {
 
 bool LocalTestServer::LaunchPython(const FilePath& testserver_path) {
-  FilePath python_exe;
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &python_exe))
+  CommandLine python_command(CommandLine::NO_PROGRAM);
+  if (!GetPythonCommand(&python_command))
     return false;
-  python_exe = python_exe
-      .Append(FILE_PATH_LITERAL("third_party"))
-      .Append(FILE_PATH_LITERAL("python_26"))
-      .Append(FILE_PATH_LITERAL("python.exe"));
 
-  CommandLine python_command(python_exe);
   python_command.AppendArgPath(testserver_path);
   if (!AddCommandLineArguments(&python_command))
     return false;
 
   HANDLE child_read = NULL;
   HANDLE child_write = NULL;
   if (!CreatePipe(&child_read, &child_write, NULL, 0)) {
     PLOG(ERROR) << "Failed to create pipe";
     return false;
   }
@@ skipping 63 matching lines @@
   if (!ParseServerData(server_data)) {
     LOG(ERROR) << "Could not parse server_data: " << server_data;
     return false;
   }
 
   return true;
 }
 
 }  // namespace net