summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 02:26:08 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 02:26:08 +0000
commitec2f688a0ea9bb4e4cb17575bc39e16cf5b4bb06 (patch)
tree5dd62305a771e12edade5de239b88255022412ea /net/test
parentc0b0a690853bc8e2d653f1524466750f7bf57188 (diff)
downloadchromium_src-ec2f688a0ea9bb4e4cb17575bc39e16cf5b4bb06.zip
chromium_src-ec2f688a0ea9bb4e4cb17575bc39e16cf5b4bb06.tar.gz
chromium_src-ec2f688a0ea9bb4e4cb17575bc39e16cf5b4bb06.tar.bz2
Revert 69356 - Regenerate the root certificate and end-entity certificates used for various tests in net_unittests, now that Windows can temporarily trust certificates for the duration of tests.
In addition, add unittests for net::TestRootCerts, which depend on the certs being tested not being trusted by the system beforehand. BUG=8470, 5552 TEST=TestRootCertsTest.* Review URL: http://codereview.chromium.org/5535006 TBR=rsleevi@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
-rw-r--r--net/test/test_server.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index ec8c687..9722dc1 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -307,7 +307,7 @@ bool TestServer::SetPythonPath() {
}
FilePath TestServer::GetRootCertificatePath() {
- return certificates_dir_.AppendASCII("root_ca_cert.pem");
+ return certificates_dir_.AppendASCII("root_ca_cert.crt");
}
bool TestServer::LoadTestRootCert() {