Add a new net::Error value: ERR_CONNECTION_TIMED_OUT.

net/socket/tcp_client_socket_libevent.cc

 // Copyright (c) 2006-2008 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_client_socket_libevent.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/socket.h>
@@ skipping 49 matching lines @@
     case EADDRNOTAVAIL:
       return ERR_ADDRESS_INVALID;
     case 0:
       return OK;
     default:
       LOG(WARNING) << "Unknown error " << err << " mapped to net::ERR_FAILED";
       return ERR_FAILED;
   }
 }
 
+int MapConnectError(int err) {
+  switch (err) {
+    case ETIMEDOUT:
+      return ERR_CONNECTION_TIMED_OUT;
+    default:
+      return MapPosixError(err);
+  }
+}
+
 }  // namespace
 
 //-----------------------------------------------------------------------------
 
 TCPClientSocketLibevent::TCPClientSocketLibevent(const AddressList& addresses)
     : socket_(kInvalidSocket),
       addresses_(addresses),
       current_ai_(addresses_.head()),
       waiting_connect_(false),
       read_watcher_(this),
@@ skipping 28 matching lines @@
     return OK;
   }
 
   // Synchronous operation not supported
   DCHECK(callback);
 
   if (errno != EINPROGRESS) {
     DLOG(INFO) << "connect failed: " << errno;
     close(socket_);
     socket_ = kInvalidSocket;
-    return MapPosixError(errno);
+    return MapConnectError(errno);
   }
 
   // Initialize write_socket_watcher_ and link it to our MessagePump.
   // POLLOUT is set if the connection is established.
   // POLLIN is set if the connection fails.
   if (!MessageLoopForIO::current()->WatchFileDescriptor(
           socket_, true, MessageLoopForIO::WATCH_WRITE, &write_socket_watcher_,
           &write_watcher_)) {
     DLOG(INFO) << "WatchFileDescriptor failed: " << errno;
     close(socket_);
@@ skipping 173 matching lines @@
              error_code == ECONNREFUSED ||
              error_code == ENETUNREACH ||
              error_code == EHOSTUNREACH ||
              error_code == ETIMEDOUT)) {
     // This address failed, try next one in list.
     const addrinfo* next = current_ai_->ai_next;
     Disconnect();
     current_ai_ = next;
     result = Connect(write_callback_);
   } else {
-    result = MapPosixError(error_code);
+    result = MapConnectError(error_code);
     bool ok = write_socket_watcher_.StopWatchingFileDescriptor();
     DCHECK(ok);
     waiting_connect_ = false;
   }
 
   if (result != ERR_IO_PENDING) {
     DoWriteCallback(result);
   }
 }
 
@@ skipping 41 matching lines @@
     DoWriteCallback(result);
   }
 }
 
 int TCPClientSocketLibevent::GetPeerName(struct sockaddr *name,
                                          socklen_t *namelen) {
   return ::getpeername(socket_, name, namelen);
 }
 
 }  // namespace net