Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(543)

Unified Diff: net/test/test_server.cc

Issue 6161007: New protocol and testserver for the Chrome-DMServer protocol (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments + some cleanup Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/test/test_server.h ('k') | net/tools/testserver/device_management.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/test_server.cc
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index 36ebf334753381b80c11e5d6ff0f240352a7db73..8f4e8d64d7cb97c0c0b2854e0f7c9e8f28d1907b 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");
« no previous file with comments | « net/test/test_server.h ('k') | net/tools/testserver/device_management.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698