| Index: net/socket/tcp_socket_win.cc
|
| diff --git a/net/socket/tcp_socket_win.cc b/net/socket/tcp_socket_win.cc
|
| index f96d678c6aeed7ef3b7aa8ddcd25e0f05bcbe922..d68c6be2f6fa3cbd36b3542fd16044fc641c944a 100644
|
| --- a/net/socket/tcp_socket_win.cc
|
| +++ b/net/socket/tcp_socket_win.cc
|
| @@ -814,17 +814,7 @@ int TCPSocketWin::DoConnect() {
|
| if (!peer_address_->ToSockAddr(storage.addr, &storage.addr_len))
|
| return ERR_ADDRESS_INVALID;
|
|
|
| - int result;
|
| - int os_error;
|
| - {
|
| - // TODO(ricea): Remove ScopedTracker below once crbug.com/436634 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 connect()"));
|
| - result = connect(socket_, storage.addr, storage.addr_len);
|
| - os_error = WSAGetLastError();
|
| - }
|
| -
|
| - if (!result) {
|
| + if (!connect(socket_, storage.addr, storage.addr_len)) {
|
| // Connected without waiting!
|
| //
|
| // The MSDN page for connect says:
|
| @@ -840,6 +830,7 @@ int TCPSocketWin::DoConnect() {
|
| if (ResetEventIfSignaled(core_->read_overlapped_.hEvent))
|
| return OK;
|
| } else {
|
| + int os_error = WSAGetLastError();
|
| if (os_error != WSAEWOULDBLOCK) {
|
| LOG(ERROR) << "connect failed: " << os_error;
|
| connect_os_error_ = os_error;
|
| @@ -849,10 +840,6 @@ int TCPSocketWin::DoConnect() {
|
| }
|
| }
|
|
|
| - // TODO(ricea): Remove ScopedTracker below once crbug.com/436634 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 WatchForRead()"));
|
| -
|
| core_->WatchForRead();
|
| return ERR_IO_PENDING;
|
| }
|
|
|