Split out policy code from net/tools/testserver.

chrome/browser/policy/test/local_policy_test_server.cc

Index: chrome/browser/policy/test/local_policy_test_server.cc
diff --git a/chrome/browser/policy/test/local_policy_test_server.cc b/chrome/browser/policy/test/local_policy_test_server.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ba417232650b0b2feda3e096652b33c1d18e4617
--- /dev/null
+++ b/chrome/browser/policy/test/local_policy_test_server.cc
@@ -0,0 +1,94 @@
+// Copyright (c) 2013 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/policy/test/local_policy_test_server.h"
+
+#include "base/command_line.h"

[Joao da Silva, 2013/02/12 19:06:05]

not used

[Mattias Nissler (ping if slow), 2013/02/13 11:54:10]

Done.

+#include "base/path_service.h"
+#include "base/stringprintf.h"
+#include "base/values.h"
+#include "net/test/base_test_server.h"
+#include "net/test/python_utils.h"
+
+namespace policy {
+
+LocalPolicyTestServer::LocalPolicyTestServer(const FilePath& config_file)
+    : net::LocalTestServer(net::BaseTestServer::TYPE_HTTP,
+                           net::BaseTestServer::kLocalhost,
+                           FilePath()),
+      config_file_(config_file) {}
+
+LocalPolicyTestServer::LocalPolicyTestServer(const std::string& test_name)
+    : net::LocalTestServer(net::BaseTestServer::TYPE_HTTP,
+                           net::BaseTestServer::kLocalhost,
+                           FilePath()) {
+  // Read configuration from a file in chrome/test/data/policy.
+  FilePath source_root;
+  CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &source_root));
+  config_file_ = source_root
+      .AppendASCII("chrome")
+      .AppendASCII("test")
+      .AppendASCII("data")

[Joao da Silva, 2013/02/12 19:06:05]

FWIW there's also chrome::DIR_TEST_DATA

[Mattias Nissler (ping if slow), 2013/02/13 11:54:10]

Done.

+      .AppendASCII("policy")
+      .AppendASCII(base::StringPrintf("policy_%s.json", test_name.c_str()));
+}
+
+LocalPolicyTestServer::~LocalPolicyTestServer() {}
+
+GURL LocalPolicyTestServer::GetServiceURL() const {
+  return GetURL("device_management");
+}
+
+bool LocalPolicyTestServer::SetPythonPath() const {
+  if (!net::LocalTestServer::SetPythonPath())
+    return false;
+
+  // Add the net/tools/testserver directory to the path.
+  FilePath net_testserver_path;
+  if (!LocalTestServer::GetTestServerPath(&net_testserver_path)) {
+    LOG(ERROR) << "Failed to get net testserver path.";
+    return false;
+  }
+  AppendToPythonPath(net_testserver_path.DirName());
+
+  // Add the generated python protocol buffer bindings.
+  FilePath pyproto_dir;
+  if (!GetPyProtoPath(&pyproto_dir)) {
+    LOG(ERROR) << "Cannot find pyproto dir for generated code.";
+    return false;
+  }
+
+  AppendToPythonPath(pyproto_dir
+                     .AppendASCII("chrome")
+                     .AppendASCII("browser")
+                     .AppendASCII("policy")
+                     .AppendASCII("proto"));
+  return true;
+}
+
+bool LocalPolicyTestServer::GetTestServerPath(FilePath* testserver_path) const {
+  FilePath source_root;
+  if (!PathService::Get(base::DIR_SOURCE_ROOT, &source_root)) {
+    LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
+    return false;
+  }
+  *testserver_path = source_root
+      .AppendASCII("chrome")
+      .AppendASCII("browser")
+      .AppendASCII("policy")
+      .AppendASCII("test")
+      .AppendASCII("policy_testserver.py");
+  return true;
+}
+
+bool LocalPolicyTestServer::GenerateAdditionalArguments(
+    base::DictionaryValue* arguments) const {
+  if (!net::LocalTestServer::GenerateAdditionalArguments(arguments))
+    return false;
+
+  arguments->SetString("config-file", config_file_.AsUTF8Unsafe());
+  return true;
+}
+
+}  // namespace policy;

[Joao da Silva, 2013/02/12 19:06:05]

remove ;