summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorgfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 18:15:24 +0000
committergfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 18:15:24 +0000
commita032ea356ab1e79d1041a976de1fd1ab5b3e47bb (patch)
tree2d9f080bf49e3d6eaf8259dfdedd286983aaac08 /net/test
parent3618712f7446888f98f1de967b4d5d955b54715d (diff)
downloadchromium_src-a032ea356ab1e79d1041a976de1fd1ab5b3e47bb.zip
chromium_src-a032ea356ab1e79d1041a976de1fd1ab5b3e47bb.tar.gz
chromium_src-a032ea356ab1e79d1041a976de1fd1ab5b3e47bb.tar.bz2
New protocol and testserver for the Chrome-DMServer protocol
New features: -Message to ping DMServer and ask if a user is managed -Signed policy responses -Server assigns names to ChromeOS devices A temporary version of cloud_policies.proto is also checked in (it will be auto-generated later). BUG=chromium-os:11253,chromium-os:11254 TEST=none Review URL: http://codereview.chromium.org/6161007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
-rw-r--r--net/test/test_server.cc7
-rw-r--r--net/test/test_server.h2
2 files changed, 6 insertions, 3 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index 36ebf334..8f4e8d6 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -331,7 +331,7 @@ bool TestServer::ParseServerData(const std::string& server_data) {
return true;
}
-FilePath TestServer::GetRootCertificatePath() {
+FilePath TestServer::GetRootCertificatePath() const {
return certificates_dir_.AppendASCII("root_ca_cert.crt");
}
@@ -344,6 +344,9 @@ bool TestServer::AddCommandLineArguments(CommandLine* command_line) const {
command_line->AppendSwitchASCII("port",
base::IntToString(host_port_pair_.port()));
command_line->AppendSwitchPath("data-dir", document_root_);
+ command_line->AppendSwitchPath("policy-cert-chain",
+ certificates_dir_.AppendASCII("ok_cert.pem"));
+ command_line->AppendSwitchPath("policy-cert-chain", GetRootCertificatePath());
if (type_ == TYPE_FTP) {
command_line->AppendArg("-f");
diff --git a/net/test/test_server.h b/net/test/test_server.h
index c83b284..03a4dfc 100644
--- a/net/test/test_server.h
+++ b/net/test/test_server.h
@@ -150,7 +150,7 @@ class TestServer {
bool ParseServerData(const std::string& server_data) WARN_UNUSED_RESULT;
// Returns path to the root certificate.
- FilePath GetRootCertificatePath();
+ FilePath GetRootCertificatePath() const;
// Load the test root cert, if it hasn't been loaded yet.
bool LoadTestRootCert() WARN_UNUSED_RESULT;