diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 17:53:23 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 17:53:23 +0000 |
| commit | c0416bab5039bae5796c25605907f2e1289d5585 (patch) | |
| tree | 3395c3d3d3605de4234fdad5fbcba6b3bbf7053a /net/socket/ssl_client_socket_nss.h | |
| parent | 62f0486fab337dba8a359c4e938dc3edd563ca5e (diff) | |
| download | chromium_src-c0416bab5039bae5796c25605907f2e1289d5585.zip chromium_src-c0416bab5039bae5796c25605907f2e1289d5585.tar.gz chromium_src-c0416bab5039bae5796c25605907f2e1289d5585.tar.bz2 | |
Revert Revert Revert "net: uncork NSS sockets after a 200ms timeout."
Failing SSLClientSocketTest.ConnectExpired and ConnectMismatched on Windows
memory bots.
ssl_client_socket_unittest.cc(122/167):
error: Value of:
net::LogContainsEndEvent( log.entries(), -1, net::NetLog::TYPE_SSL_CONNECT)
Actual: false (Actual event: SOCKET_BYTES_SENT. Expected event: SSL_CONNECT.)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.h')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h index 7b9809b..7f5ee94 100644 --- a/net/socket/ssl_client_socket_nss.h +++ b/net/socket/ssl_client_socket_nss.h @@ -16,7 +16,6 @@ #include "base/scoped_ptr.h" #include "base/time.h" -#include "base/timer.h" #include "net/base/cert_verify_result.h" #include "net/base/completion_callback.h" #include "net/base/net_log.h" @@ -103,7 +102,6 @@ class SSLClientSocketNSS : public SSLClientSocket { void SaveSnapStartInfo(); bool LoadSnapStartInfo(const std::string& info); bool IsNPNProtocolMispredicted(); - void UncorkAfterTimeout(); bool DoTransportIO(); int BufferSend(void); @@ -132,9 +130,6 @@ class SSLClientSocketNSS : public SSLClientSocket { // corked_ is true if we are currently suspending writes to the network. This // is named after the similar kernel flag, TCP_CORK. bool corked_; - // uncork_timer_ is used to limit the amount of time that we'll delay the - // Finished message while waiting for a Write. - base::OneShotTimer<SSLClientSocketNSS> uncork_timer_; scoped_refptr<IOBuffer> recv_buffer_; CompletionCallbackImpl<SSLClientSocketNSS> handshake_io_callback_; |