Revert 154861 - 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 76 matching lines @@
   }
 
   testserver_dir = testserver_dir
       .Append(FILE_PATH_LITERAL("net"))
       .Append(FILE_PATH_LITERAL("tools"))
       .Append(FILE_PATH_LITERAL("testserver"));
   *directory = testserver_dir;
   return true;
 }
 
-bool LocalTestServer::GetTestServerPath(FilePath* testserver_path) const {
-  if (!GetTestServerDirectory(testserver_path))
-    return false;
-  *testserver_path = testserver_path->Append(FILE_PATH_LITERAL(
-      "testserver.py"));
-  return true;
-}
-
 bool LocalTestServer::Start() {
   // Get path to Python server script.
   FilePath testserver_path;
-  if (!GetTestServerPath(&testserver_path))
+  if (!GetTestServerDirectory(&testserver_path))
     return false;
+  testserver_path =
+      testserver_path.Append(FILE_PATH_LITERAL("testserver.py"));
 
   if (!SetPythonPath())
     return false;
 
   if (!LaunchPython(testserver_path))
     return false;
 
   if (!WaitToStart()) {
     Stop();
     return false;
@@ skipping 38 matching lines @@
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_dir))
     return false;
   SetResourcePath(src_dir.Append(document_root),
                   src_dir.AppendASCII("net")
                          .AppendASCII("data")
                          .AppendASCII("ssl")
                          .AppendASCII("certificates"));
   return true;
 }
 
-bool LocalTestServer::SetPythonPath() const {
-  return SetPythonPathStatic();
-}
-
 // static
-bool LocalTestServer::SetPythonPathStatic() {
+bool LocalTestServer::SetPythonPath() {
   FilePath third_party_dir;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &third_party_dir)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }
   third_party_dir = third_party_dir.AppendASCII("third_party");
 
   // For simplejson. (simplejson, unlike all the other Python modules
   // we include, doesn't have an extra 'simplejson' directory, so we
   // need to include its parent directory, i.e. third_party_dir).
@@ skipping 74 matching lines @@
           std::string("--auth-token") + "=" + BaseTestServer::kGDataAuthToken);
       break;
     default:
       NOTREACHED();
       return false;
   }
 
   return true;
 }
 
-void LocalTestServer::AddPythonArguments(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);
-}
-
 }  // namespace net