diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-23 12:51:42 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-23 12:51:42 +0000 |
| commit | c8cb9612733811e0b6cf4a313d35043e8dde6fdc (patch) | |
| tree | 22db770bccbd48080cdcef196456f57fb7e213cf /net/socket/tcp_client_socket_win.cc | |
| parent | 7ef03e00c0b4b0e6b1998a6a3d69fafb6d630f12 (diff) | |
| download | chromium_src-c8cb9612733811e0b6cf4a313d35043e8dde6fdc.zip chromium_src-c8cb9612733811e0b6cf4a313d35043e8dde6fdc.tar.gz chromium_src-c8cb9612733811e0b6cf4a313d35043e8dde6fdc.tar.bz2 | |
Revert 63643 - Add Reset to ClientSocket::UseHistory, and call on TCP disconnect.
There were a few repeating failures after I landed this CL. They looked unrelated, but I decided to revert since I didn't have a ton of time to continue investigating. Will hopefully reland soon.
The HttpProxyClientSocket reuses the same TcpClientSocket in the case that it is trying to establish a tunnel through
an authenticating proxy, but the proxy closed the TCP connection.
Also, fix SetOmniboxSpeculation on the TCPClientSocket implementations.
BUG=54062
TEST=Tried normal connections to make sure histograms were only emitted once, as well as https tunnels through an authenticating proxy to ensure that the use_history was correctly reset.
Review URL: http://codereview.chromium.org/3360007
TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/4006004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/tcp_client_socket_win.cc')
| -rw-r--r-- | net/socket/tcp_client_socket_win.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc index f70d61b..9143b81 100644 --- a/net/socket/tcp_client_socket_win.cc +++ b/net/socket/tcp_client_socket_win.cc @@ -290,8 +290,8 @@ TCPClientSocketWin::TCPClientSocketWin(const AddressList& addresses, write_callback_(NULL), next_connect_state_(CONNECT_STATE_NONE), connect_os_error_(0), - net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)), - previously_disconnected_(false) { + net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)) { + scoped_refptr<NetLog::EventParameters> params; if (source.is_valid()) params = new NetLogSourceParameter("source_dependency", source); @@ -364,11 +364,6 @@ int TCPClientSocketWin::DoConnect() { DCHECK(ai); DCHECK_EQ(0, connect_os_error_); - if (previously_disconnected_) { - use_history_.Reset(); - previously_disconnected_ = false; - } - net_log_.BeginEvent(NetLog::TYPE_TCP_CONNECT_ATTEMPT, new NetLogStringParameter( "address", NetAddressToStringWithPort(current_ai_))); @@ -483,8 +478,6 @@ void TCPClientSocketWin::DoDisconnect() { core_->Detach(); core_ = NULL; - - previously_disconnected_ = true; } bool TCPClientSocketWin::IsConnected() const { |