Run safebrowsing_service_test through the net testserver code.

chrome/browser/safe_browsing/local_safebrowsing_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 "chrome/browser/safe_browsing/local_safebrowsing_test_server.h"
+
+#include "base/command_line.h"
+#include "base/path_service.h"
+#include "base/string_number_conversions.h"
+#include "base/values.h"
+#include "net/test/python_utils.h"
+#include "net/test/test_server.h"
+
+LocalSafeBrowsingTestServer::LocalSafeBrowsingTestServer(
+    const FilePath& data_file)
+    : net::LocalTestServer(net::TestServer::TYPE_HTTP,
+                           net::TestServer::kLocalhost,
+                           FilePath()),
+      data_file_(data_file) {}
+
+LocalSafeBrowsingTestServer::~LocalSafeBrowsingTestServer() {}
+
+bool LocalSafeBrowsingTestServer::GetTestServerPath(
+    FilePath* testserver_path) const {
+  FilePath testserver_dir;
+  if (!PathService::Get(base::DIR_SOURCE_ROOT, &testserver_dir)) {
+    LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
+    return false;
+  }
+
+  testserver_dir = testserver_dir
+      .Append(FILE_PATH_LITERAL("chrome"))
+      .Append(FILE_PATH_LITERAL("browser"))
+      .Append(FILE_PATH_LITERAL("safe_browsing"));
+
+  *testserver_path = testserver_dir.Append(FILE_PATH_LITERAL(
+      "safe_browsing_testserver.py"));
+  return true;
+}
+
+bool LocalSafeBrowsingTestServer::SetPythonPath() const {
+  if (!net::LocalTestServer::SetPythonPath())
+    return false;
+
+  // Locate the Python code generated by the protocol buffers compiler.
+  FilePath pyproto_dir;
+  if (!GetPyProtoPath(&pyproto_dir)) {
+    LOG(ERROR) << "Cannot find pyproto dir for generated code.";
+    return false;
+  }
+
+  AppendToPythonPath(pyproto_dir.AppendASCII("google"));
+  return true;
+}
+
+bool LocalSafeBrowsingTestServer::AddCommandLineArguments(

[Ryan Sleevi, 2012/08/08 06:15:40]

Perhaps that, instead of having to override AddCommandLineArguments, have
BaseTestServer's GenerateArguments() call a protected virtual method (default:
no-op) that allows derived classes to append any derived-test specific
arguments.

The reason for doing it that way, rather than via AddCommandLineArguments, is
that GenerateArguments is shared between the LocalTestServer and
RemoteTestServer as the common way for the tests to communicate their args to
"the thing that will spawn tests".

For LocalTestServer, the GenerateArguments dictionary is converted straight into
command-line arguments. For the RemoteTestServer, the GenerateArguments is
passed as JSON in the "start a server of type X" request, and then the
server-spawner converts the JSON into command-line arguments (and adjusting
paths as appropriate) for the test server that will accept the remote
connections.

While this distinction is probably less important for safe browsing (since AIUI,
Android doesn't have safe browsing service), sync could also manage it's
command-line arguments this way, and that is shared.

[mattm, 2012/08/30 21:50:47]

That sounds reasonable, changed.

I'm still unsure how the inheritance hierarchy should work out there, though,
since we don't use multiple inheritance.  Maybe instead of having a
LocalSafeBrowsingTestServer, you would have to make a SafeBrowsingTestServer
which inherits from the TestServer typedef and then use ifdefs to only define
the right functions for if you are actually compiling a Remote or Local one?
hmm.

+    CommandLine* command_line) const {
+  if (!net::LocalTestServer::AddCommandLineArguments(command_line))
+    return false;
+  // We can't use AppendSwitchPath since it will stick the switch before the
+  // path to the python script.
+  std::string data_file_string = data_file_.MaybeAsASCII();
+  if (data_file_string.empty()) {
+    LOG(ERROR) << "data_file path is non-ascii";
+    return false;
+  }
+  command_line->AppendArg("--data-file=" + data_file_string);
+  return true;
+}