Don't HANDLE_EINTR(close). Either IGNORE_EINTR(close) or just close.

tools/android/common/adb_connection.cc

 // Copyright (c) 2012 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 "tools/android/common/adb_connection.h"
 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "tools/android/common/net.h"
 
 namespace tools {
 namespace {
 
 void CloseSocket(int fd) {
   if (fd >= 0) {
     int old_errno = errno;
-    (void) HANDLE_EINTR(close(fd));
+    close(fd);
     errno = old_errno;
   }
 }
 
 }  // namespace
 
 int ConnectAdbHostSocket(const char* forward_to) {
   // ADB port forward request format: HHHHtcp:port:address.
   // HHHH is the hexidecimal length of the "tcp:port:address" part.
   const size_t kBufferMaxLength = 30;
@@ skipping 62 matching lines @@
     LOG(ERROR) << "Bad response from ADB: length: " << response_length
                << " data: " << DumpBinary(response, response_length);
     CloseSocket(host_socket);
     return -1;
   }
 
   return host_socket;
 }
 
 }  // namespace tools