Run safebrowsing_service_test through the net testserver code.

net/test/local_test_server.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 "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 167 matching lines @@
 
   // Locate the Python code generated by the protocol buffers compiler.
   FilePath pyproto_dir;
   if (!GetPyProtoPath(&pyproto_dir)) {
     LOG(WARNING) << "Cannot find pyproto dir for generated code. "
                  << "Testserver features that rely on it will not work";
     return true;
   }
 
   AppendToPythonPath(pyproto_dir);
+  AppendToPythonPath(pyproto_dir.AppendASCII("google"));
   AppendToPythonPath(pyproto_dir.AppendASCII("sync").AppendASCII("protocol"));
   AppendToPythonPath(pyproto_dir.AppendASCII("chrome")
                                 .AppendASCII("browser")
                                 .AppendASCII("policy")
                                 .AppendASCII("proto"));
 
   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;
 
   // Serialize the argument dictionary into CommandLine.
   for (DictionaryValue::Iterator it(arguments_dict); it.HasNext();
        it.Advance()) {
     const base::Value& value = it.value();
     const std::string& key = it.key();
 
@@ skipping 14 matching lines @@
 
   // Append the appropriate server type argument.
   switch (type()) {
     case TYPE_HTTP:
     case TYPE_HTTPS:
       // The default type is HTTP, no argument required.
       break;
     case TYPE_FTP:
       command_line->AppendArg("-f");
       break;
+    case TYPE_SAFEBROWSING:
+      command_line->AppendArg("--safebrowsing");
+      break;
     case TYPE_SYNC:
       command_line->AppendArg("--sync");
       break;
     case TYPE_TCP_ECHO:
       command_line->AppendArg("--tcp-echo");
       break;
     case TYPE_UDP_ECHO:
       command_line->AppendArg("--udp-echo");
       break;
     case TYPE_GDATA:
       command_line->AppendArg(
           std::string("--auth-token") + "=" + BaseTestServer::kGDataAuthToken);
       break;
     default:
       NOTREACHED();
       return false;
   }
 
   return true;
 }
 
 }  // namespace net