1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index 0233626..ccec75c 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -144,9 +144,12 @@ class SafeBrowsingTestServer {
     pyproto_code_dir = pyproto_code_dir.Append(FILE_PATH_LITERAL("google"));
     AppendToPythonPath(pyproto_code_dir);
 
-    CommandLine cmd_line(CommandLine::NO_PROGRAM);
-    EXPECT_TRUE(GetPythonCommand(&cmd_line));
-
+    FilePath python_runtime;
+    EXPECT_TRUE(GetPythonRunTime(&python_runtime));
+    CommandLine cmd_line(python_runtime);
+    // Make python stdout and stderr unbuffered, to prevent incomplete stderr on
+    // win bots, and also fix mixed up ordering of stdout and stderr.
+    cmd_line.AppendSwitch("-u");
     FilePath datafile = testserver_path.Append(datafile_);
     cmd_line.AppendArgPath(testserver);
     cmd_line.AppendArg(base::StringPrintf("--port=%d", kPort_));