summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 18:48:06 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 18:48:06 +0000
commit435901150ddc838314fdfcb625509a5036292c34 (patch)
treeef0564eb886d59f57a2007f9c4e3c66f2f835411 /net
parenta778b07eae5f0773ce0b9fa7be6738c12dfe3fc2 (diff)
downloadchromium_src-435901150ddc838314fdfcb625509a5036292c34.zip
chromium_src-435901150ddc838314fdfcb625509a5036292c34.tar.gz
chromium_src-435901150ddc838314fdfcb625509a5036292c34.tar.bz2
Revert 63578 - Release ChromeURLRequestContextGetters' references on IO thread shutdown.
We register all ChromeURLRequestContextGetters that have a reference to a ChromeURLRequestContext with the IOThread. We unregister them when they go away. In IOThread::CleanUp(), we tell the known ChromeURLRequestContextGetters to release their references to ChromeURLRequestContexts. BUG=58859 TEST=none Review URL: http://codereview.chromium.org/3686003 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/4014010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/ocsp/nss_ocsp.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc
index 45ee5bd..b7fcb65 100644
--- a/net/ocsp/nss_ocsp.cc
+++ b/net/ocsp/nss_ocsp.cc
@@ -878,7 +878,7 @@ 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());
+ DCHECK(request_context->is_main());
return request_context;
}