Revert of CHECK() if Windows non-blocking connect returns 0.

net/socket/tcp_socket_win.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/tcp_socket.h"
 #include "net/socket/tcp_socket_win.h"
 
 #include <mstcpip.h>
 
 #include "base/callback_helpers.h"
@@ skipping 783 matching lines @@
     return ERR_ADDRESS_INVALID;
 
   int result;
   {
     // 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);
   }
 
-  // The MSDN page for connect says:
-  //   With a nonblocking socket, the connection attempt cannot be completed
-  //   immediately. In this case, connect will return SOCKET_ERROR, and
-  //   WSAGetLastError will return WSAEWOULDBLOCK.
-  // which implies that for a nonblocking socket, connect never returns 0.
-  // It's not clear what the correct thing to do is if connect()
-  // returns 0. It's not clear whether this ever happens in practice.
-  // This CHECK() is here to verify that it doesn't.
-  // TODO(ricea): If the CHECK() fires in canary or dev, revert this
-  // CL. If it doesn't, reconsider what we want to do here long-term.
-  CHECK(result);
+  if (!result) {
+    // Connected without waiting!
+    //
+    // The MSDN page for connect says:
+    //   With a nonblocking socket, the connection attempt cannot be completed
+    //   immediately. In this case, connect will return SOCKET_ERROR, and
+    //   WSAGetLastError will return WSAEWOULDBLOCK.
+    // which implies that for a nonblocking socket, connect never returns 0.
+    // It's not documented whether the event object will be signaled or not
+    // if connect does return 0.  So the code below is essentially dead code
+    // and we don't know if it's correct.
+    NOTREACHED();
 
-  int os_error = WSAGetLastError();
-  if (os_error != WSAEWOULDBLOCK) {
-    LOG(ERROR) << "connect failed: " << os_error;
-    connect_os_error_ = os_error;
-    int rv = MapConnectError(os_error);
-    CHECK_NE(ERR_IO_PENDING, rv);
-    return rv;
+    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;
+      int rv = MapConnectError(os_error);
+      CHECK_NE(ERR_IO_PENDING, rv);
+      return rv;
+    }
   }
 
   // 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;
 }
 
@@ skipping 199 matching lines @@
 
   waiting_read_ = false;
   core_->read_iobuffer_ = NULL;
   core_->read_buffer_length_ = 0;
 
   DCHECK_NE(rv, ERR_IO_PENDING);
   base::ResetAndReturn(&read_callback_).Run(rv);
 }
 
 }  // namespace net