summaryrefslogtreecommitdiffstats
path: root/chrome/browser/io_thread.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 22:24:58 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 22:24:58 +0000
commit6827bceba32719b03a6cf49faf0b2cde17685f2f (patch)
tree8c418c315397976360690e987cad428241a02c22 /chrome/browser/io_thread.cc
parent1d87c2835130363d56fd759cc396bc83aae4ecbd (diff)
downloadchromium_src-6827bceba32719b03a6cf49faf0b2cde17685f2f.zip
chromium_src-6827bceba32719b03a6cf49faf0b2cde17685f2f.tar.gz
chromium_src-6827bceba32719b03a6cf49faf0b2cde17685f2f.tar.bz2
Revert 59511 (potentially caused chromiumos leaks) - Take 2: Eagerly set the IO loop used for OCSP.
Refactor nss_ocsp.cc code even more. Split up OCSP initialization into two LazyInstances. One is for the IO loop. One is for registration of OCSP callbacks in NSS, which will load NSS into memory. Sync and the normal network stack race to set their loop at the IO loop used by OCSP. We fix that by providing a SetMessageLoopForOCSP() function which will be called in the IOThread initialization code which runs before the sync thread starts up. Since we split this up from the registration of the OCSP callbacks, it won't also eagerly load NSS, which previously regressed startup time. Note that the URLRequestContext pointer is still a global, not associated with either of the LazyInstances, because it's used by worker threads which can run past the lifetime of the LazyInstances. BUG=36740 TEST=none Review URL: http://codereview.chromium.org/3446001 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/3424010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
-rw-r--r--chrome/browser/io_thread.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 12bb00e..3780118 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -24,9 +24,6 @@
#include "net/base/net_util.h"
#include "net/http/http_auth_filter.h"
#include "net/http/http_auth_handler_factory.h"
-#if defined(USE_NSS)
-#include "net/ocsp/nss_ocsp.h"
-#endif // defined(USE_NSS)
namespace {
@@ -178,12 +175,6 @@ void IOThread::ChangedToOnTheRecord() {
void IOThread::Init() {
BrowserProcessSubThread::Init();
- DCHECK_EQ(MessageLoop::TYPE_IO, message_loop()->type());
-
-#if defined(USE_NSS)
- net::SetMessageLoopForOCSP();
-#endif // defined(USE_NSS)
-
DCHECK(!globals_);
globals_ = new Globals;