summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-21 00:04:46 +0000
committerstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-21 00:04:46 +0000
commit54197ad6f6119e903809a76ab22ffaa7815b8818 (patch)
tree477d563b3c19bc682bc18e38f6a57025b47b3354 /net
parent66627408337e26285ae1849b251b27018d0f91ea (diff)
downloadchromium_src-54197ad6f6119e903809a76ab22ffaa7815b8818.zip
chromium_src-54197ad6f6119e903809a76ab22ffaa7815b8818.tar.gz
chromium_src-54197ad6f6119e903809a76ab22ffaa7815b8818.tar.bz2
Skip certification root initialization if it's not needed.
Review URL: http://codereview.chromium.org/28010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/ssl_test_util.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/net/base/ssl_test_util.cc b/net/base/ssl_test_util.cc
index 0b82a6e..c051492 100644
--- a/net/base/ssl_test_util.cc
+++ b/net/base/ssl_test_util.cc
@@ -149,10 +149,12 @@ bool TestServerLauncher::Start(Protocol protocol,
const std::string& host_name, int port,
const FilePath& document_root,
const FilePath& cert_path) {
- if (!LoadTestRootCert())
- return false;
- if (!CheckCATrusted())
- return false;
+ if (!cert_path.value().empty()) {
+ if (!LoadTestRootCert())
+ return false;
+ if (!CheckCATrusted())
+ return false;
+ }
std::string port_str = IntToString(port);