diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 22:56:23 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 22:56:23 +0000 |
| commit | 7d3d2ed0aa4396620c38aee1aafd2e56f6133b5e (patch) | |
| tree | 43cea4bb218f0de5fa40c914588aa15a26cd801b /net/socket/ssl_client_socket_nss.cc | |
| parent | 831d9ba79c56fc142147b88287e787ed38395b76 (diff) | |
| download | chromium_src-7d3d2ed0aa4396620c38aee1aafd2e56f6133b5e.zip chromium_src-7d3d2ed0aa4396620c38aee1aafd2e56f6133b5e.tar.gz chromium_src-7d3d2ed0aa4396620c38aee1aafd2e56f6133b5e.tar.bz2 | |
Switch the NSS thread from being a base::Thread to a base::SequencedWorkerPool of 1
BUG=135435
TEST=existing + tsan bots
Review URL: https://chromiumcodereview.appspot.com/10749009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 8d677ef..0c3ea4e 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -707,7 +707,7 @@ class SSLClientSocketNSS::Core : public base::RefCountedThreadSafe<Core> { // |server_bound_cert_service|, and they will not be accessed once Detach() // has been called. Core(base::SequencedTaskRunner* network_task_runner, - base::SingleThreadTaskRunner* nss_task_runner, + base::SequencedTaskRunner* nss_task_runner, ClientSocketHandle* transport, const HostPortPair& host_and_port, const SSLConfig& ssl_config, @@ -977,7 +977,7 @@ class SSLClientSocketNSS::Core : public base::RefCountedThreadSafe<Core> { // task runner. //////////////////////////////////////////////////////////////////////////// scoped_refptr<base::SequencedTaskRunner> network_task_runner_; - scoped_refptr<base::SingleThreadTaskRunner> nss_task_runner_; + scoped_refptr<base::SequencedTaskRunner> nss_task_runner_; // Dereferenced only on the network task runner, but bound to tasks destined // for the network task runner from the NSS task runner. @@ -996,7 +996,7 @@ class SSLClientSocketNSS::Core : public base::RefCountedThreadSafe<Core> { SSLClientSocketNSS::Core::Core( base::SequencedTaskRunner* network_task_runner, - base::SingleThreadTaskRunner* nss_task_runner, + base::SequencedTaskRunner* nss_task_runner, ClientSocketHandle* transport, const HostPortPair& host_and_port, const SSLConfig& ssl_config, @@ -2711,7 +2711,7 @@ void SSLClientSocketNSS::Core::SetChannelIDProvided() { } SSLClientSocketNSS::SSLClientSocketNSS( - base::SingleThreadTaskRunner* nss_task_runner, + base::SequencedTaskRunner* nss_task_runner, ClientSocketHandle* transport_socket, const HostPortPair& host_and_port, const SSLConfig& ssl_config, |