diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-11 17:43:49 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-11 17:43:49 +0000 |
| commit | 3a13312bf873947f06d5f71b55aa92246a43f66f (patch) | |
| tree | d5b2e93262cd34b6f127a99444ea246106b55e6c /chrome/browser/io_thread.cc | |
| parent | 91780ac0a3e2be130ec073db636073bf04785e51 (diff) | |
| download | chromium_src-3a13312bf873947f06d5f71b55aa92246a43f66f.zip chromium_src-3a13312bf873947f06d5f71b55aa92246a43f66f.tar.gz chromium_src-3a13312bf873947f06d5f71b55aa92246a43f66f.tar.bz2 | |
Revert r59190 for regressing startup tests.
BUG=36740
TEST=
Review URL: http://codereview.chromium.org/3341029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 8d03c90..91ea106 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -7,7 +7,6 @@ #include "base/command_line.h" #include "base/leak_tracker.h" #include "base/logging.h" -#include "base/nss_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" @@ -25,7 +24,6 @@ #include "net/base/net_util.h" #include "net/http/http_auth_filter.h" #include "net/http/http_auth_handler_factory.h" -#include "net/ocsp/nss_ocsp.h" namespace { @@ -177,11 +175,6 @@ void IOThread::ChangedToOnTheRecord() { void IOThread::Init() { BrowserProcessSubThread::Init(); -#if defined(USE_NSS) - base::EnsureNSSInit(); - net::EnsureOCSPInit(); -#endif // defined(USE_NSS) - DCHECK(!globals_); globals_ = new Globals; |