diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 06:13:49 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 06:13:49 +0000 |
commit | 1684c609b8b60ddbd9161c42ded842dd1f62a667 (patch) | |
tree | e2ad717655f6230bd4347800fb4d19f203838c25 /chrome/browser/io_thread.cc | |
parent | dd54818d366e7050298af022a8c913c2262ca64a (diff) | |
download | chromium_src-1684c609b8b60ddbd9161c42ded842dd1f62a667.zip chromium_src-1684c609b8b60ddbd9161c42ded842dd1f62a667.tar.gz chromium_src-1684c609b8b60ddbd9161c42ded842dd1f62a667.tar.bz2 |
Revert 59972 (chromium os leaks) - Reland r59511: Eagerly set the IO loop used for OCSP.
ChromeOS will create a special Profile for login. Previously, OCSP initialization was done for the "default" ChromeURLRequestContext for each Profile. Since we can have multiple profiles, this causes the initialization (and uninitialization) to happen multiple times, which causes problems for OCSP since we use statics. The solution is to identify the "main" Profile. We create said Profile in BrowserMain. I add an "is_main_" variable to URLRequestContextGetter and URLRequestContext, so that only the "main" URLRequestContext will initialize OCSP.
Other than minor plumbing of "is_main_", this changelist is identical to r59511.
BUG=55940
TEST=Startup ChromeOS's Chrome. Should not crash on startup.
Review URL: http://codereview.chromium.org/3470001
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/3468005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
-rw-r--r-- | chrome/browser/io_thread.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index ed82c27..f361b77 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 { @@ -160,12 +157,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; |