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;