diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 22:56:27 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 22:56:27 +0000 |
| commit | 8da3067b27f52b4413c0aad3ad5da721766e2129 (patch) | |
| tree | b87070e259c0137ea7715847319d54761d919cc1 /net/socket | |
| parent | 88328f582694565b00ea445c4541f37fa73f3539 (diff) | |
| download | chromium_src-8da3067b27f52b4413c0aad3ad5da721766e2129.zip chromium_src-8da3067b27f52b4413c0aad3ad5da721766e2129.tar.gz chromium_src-8da3067b27f52b4413c0aad3ad5da721766e2129.tar.bz2 | |
Revert "Thread IO safety: annotate file_util, and block IO thread from doing IO"
This reverts commit r63580, build breakage.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 324f50c..136f138 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -71,7 +71,6 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" #include "base/values.h" #include "net/base/address_list.h" #include "net/base/cert_status_flags.h" @@ -177,11 +176,6 @@ class NSSSSLInitSingleton { // thread-safe, and the NSS SSL library will only ever be initialized once. // The NSS SSL library will be properly shut down on program exit. void EnsureNSSSSLInit() { - // Initializing SSL causes us to do blocking IO. - // Temporarily allow it until we fix - // http://code.google.com/p/chromium/issues/detail?id=59847 - base::ThreadRestrictions::ScopedAllowIO allow_io; - Singleton<NSSSSLInitSingleton>::get(); } |