Remove SetNonBlocking/SetBlocking methods from Socket and add missing close-on-exec

runtime/bin/socket_android.cc

Index: runtime/bin/socket_android.cc
diff --git a/runtime/bin/socket_android.cc b/runtime/bin/socket_android.cc
index ab9c085d72f24abb4d50348cf8f3f578b109f1b5..99ed1a50d6e27799e8b9d570f792924e3e3914dd 100644
--- a/runtime/bin/socket_android.cc
+++ b/runtime/bin/socket_android.cc
@@ -84,7 +84,7 @@ intptr_t Socket::CreateConnect(RawAddr addr, const intptr_t port) {
     return fd;
   }
 
-  Socket::SetNonBlocking(fd);
+  FDUtils::SetNonBlocking(fd);
 
   return Socket::Connect(fd, addr, port);
 }
@@ -305,7 +305,7 @@ intptr_t Socket::CreateBindDatagram(
     return -1;
   }
 
-  Socket::SetNonBlocking(fd);
+  FDUtils::SetNonBlocking(fd);
   return fd;
 }
 
@@ -365,7 +365,7 @@ intptr_t ServerSocket::CreateBindListen(RawAddr addr,
     return -1;
   }
 
-  Socket::SetNonBlocking(fd);
+  FDUtils::SetNonBlocking(fd);
   return fd;
 }
 
@@ -400,7 +400,8 @@ intptr_t ServerSocket::Accept(intptr_t fd) {
       socket = kTemporaryFailure;
     }
   } else {
-    Socket::SetNonBlocking(socket);
+    FDUtils::SetNonBlocking(socket);
+    FDUtils::SetCloseOnExec(socket);

[kustermann, 2015/02/09 16:25:32]

I'd reverse the order.

[Søren Gjesse, 2015/02/10 07:28:15]

Done.

   }
   return socket;
 }
@@ -412,16 +413,6 @@ void Socket::Close(intptr_t fd) {
 }
 
 
-bool Socket::SetNonBlocking(intptr_t fd) {
-  return FDUtils::SetNonBlocking(fd);
-}
-
-
-bool Socket::SetBlocking(intptr_t fd) {
-  return FDUtils::SetBlocking(fd);
-}
-
-
 bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
   int on;
   socklen_t len = sizeof(on);