summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_test_util.h
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 00:51:44 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 00:51:44 +0000
commitc81d9dcc72ae2f069e2952a13ec7d76eb7bb57e7 (patch)
tree37dd8c8a642e5bf50e11f6067db048a15b3016af /net/socket/ssl_test_util.h
parenta2ee4e10797088fccae92efc5c8d5cd828c97e93 (diff)
downloadchromium_src-c81d9dcc72ae2f069e2952a13ec7d76eb7bb57e7.zip
chromium_src-c81d9dcc72ae2f069e2952a13ec7d76eb7bb57e7.tar.gz
chromium_src-c81d9dcc72ae2f069e2952a13ec7d76eb7bb57e7.tar.bz2
Move LoadTemporaryCert to the new files cert_test_util.{h,cc} and
rename it LoadTemporaryRootCert, so that it can be used by x509_certificate_unittest.cc. R=eroman BUG=none TEST=No compilation and test failures. Review URL: http://codereview.chromium.org/997006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_test_util.h')
-rw-r--r--net/socket/ssl_test_util.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/socket/ssl_test_util.h b/net/socket/ssl_test_util.h
index cf24ee5..e9a6afc 100644
--- a/net/socket/ssl_test_util.h
+++ b/net/socket/ssl_test_util.h
@@ -11,6 +11,10 @@
#include "base/file_path.h"
#include "base/process_util.h"
+#if defined(USE_NSS)
+#include "base/ref_counted.h"
+#include "net/base/x509_certificate.h"
+#endif
// TODO(dkegel): share this between net/base and
// chrome/browser without putting it in net.lib
@@ -118,8 +122,7 @@ class TestServerLauncher {
int connection_timeout_;
#if defined(USE_NSS)
- struct PrivateCERTCertificate;
- PrivateCERTCertificate *cert_;
+ scoped_refptr<X509Certificate> cert_;
#endif
DISALLOW_COPY_AND_ASSIGN(TestServerLauncher);