summaryrefslogtreecommitdiffstats
path: root/net/ocsp
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-16 23:37:25 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-16 23:37:25 +0000
commit77feb46ee8d7e7b2a174714fa17e830573f01476 (patch)
tree9fb167adaaca9932dc904a02b37a272773861807 /net/ocsp
parent43549a8f2bb09da994c640f07962188bdecd78c3 (diff)
downloadchromium_src-77feb46ee8d7e7b2a174714fa17e830573f01476.zip
chromium_src-77feb46ee8d7e7b2a174714fa17e830573f01476.tar.gz
chromium_src-77feb46ee8d7e7b2a174714fa17e830573f01476.tar.bz2
Switch to using the system request context for OCSP.
This gets rid of all the ugly "is_main" logic for URLRequestContext. BUG=none TEST=none Review URL: http://codereview.chromium.org/7013071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ocsp')
-rw-r--r--net/ocsp/nss_ocsp.cc9
-rw-r--r--net/ocsp/nss_ocsp.h1
2 files changed, 0 insertions, 10 deletions
diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc
index f353778..80e5413 100644
--- a/net/ocsp/nss_ocsp.cc
+++ b/net/ocsp/nss_ocsp.cc
@@ -931,19 +931,10 @@ void ShutdownOCSP() {
void SetURLRequestContextForOCSP(URLRequestContext* request_context) {
pthread_mutex_lock(&g_request_context_lock);
if (request_context) {
- DCHECK(request_context->is_main());
DCHECK(!g_request_context);
}
g_request_context = request_context;
pthread_mutex_unlock(&g_request_context_lock);
}
-URLRequestContext* GetURLRequestContextForOCSP() {
- pthread_mutex_lock(&g_request_context_lock);
- URLRequestContext* request_context = g_request_context;
- pthread_mutex_unlock(&g_request_context_lock);
- DCHECK(!request_context || request_context->is_main());
- return request_context;
-}
-
} // namespace net
diff --git a/net/ocsp/nss_ocsp.h b/net/ocsp/nss_ocsp.h
index fae7a87..f88201d 100644
--- a/net/ocsp/nss_ocsp.h
+++ b/net/ocsp/nss_ocsp.h
@@ -26,7 +26,6 @@ void ShutdownOCSP();
// Set URLRequestContext for OCSP handlers.
void SetURLRequestContextForOCSP(URLRequestContext* request_context);
-URLRequestContext* GetURLRequestContextForOCSP();
} // namespace net