| Index: net/test/local_test_server.cc
|
| diff --git a/net/test/local_test_server.cc b/net/test/local_test_server.cc
|
| index 7fe3e589ee305dc9794b62d7b5847c8b7d03220d..82cd4ebba6cbfe35425c473ac014ad0ac008fb08 100644
|
| --- a/net/test/local_test_server.cc
|
| +++ b/net/test/local_test_server.cc
|
| @@ -185,6 +185,7 @@ bool LocalTestServer::SetPythonPath() {
|
| }
|
|
|
| AppendToPythonPath(pyproto_dir);
|
| + AppendToPythonPath(pyproto_dir.AppendASCII("google"));
|
| AppendToPythonPath(pyproto_dir.AppendASCII("sync").AppendASCII("protocol"));
|
| AppendToPythonPath(pyproto_dir.AppendASCII("chrome")
|
| .AppendASCII("browser")
|
| @@ -194,7 +195,14 @@ bool LocalTestServer::SetPythonPath() {
|
| return true;
|
| }
|
|
|
| -bool LocalTestServer::AddCommandLineArguments(CommandLine* command_line) const {
|
| +bool LocalTestServer::AddCommandLineArguments(const FilePath& testserver_path,
|
| + CommandLine* command_line) const {
|
| + // Make python stdout and stderr unbuffered, to prevent incomplete stderr on
|
| + // win bots, and also fix mixed up ordering of stdout and stderr.
|
| + command_line->AppendSwitch("-u");
|
| +
|
| + command_line->AppendArgPath(testserver_path);
|
| +
|
| base::DictionaryValue arguments_dict;
|
| if (!GenerateArguments(&arguments_dict))
|
| return false;
|
| @@ -229,6 +237,9 @@ bool LocalTestServer::AddCommandLineArguments(CommandLine* command_line) const {
|
| case TYPE_FTP:
|
| command_line->AppendArg("-f");
|
| break;
|
| + case TYPE_SAFEBROWSING:
|
| + command_line->AppendArg("--safebrowsing");
|
| + break;
|
| case TYPE_SYNC:
|
| command_line->AppendArg("--sync");
|
| break;
|
|
|