2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/common/ipc_channel_posix.cc b/chrome/common/ipc_channel_posix.cc
index f2591f6..2cdbca4 100644
--- a/chrome/common/ipc_channel_posix.cc
+++ b/chrome/common/ipc_channel_posix.cc
@@ -98,6 +98,10 @@ bool ServerAcceptFifoConnection(int server_listen_fd, int* server_socket) {
   int accept_fd = accept(server_listen_fd, NULL, 0);
   if (accept_fd < 0)
     return false;
+  if (fcntl(accept_fd, F_SETFL, O_NONBLOCK) == -1) {
+    close(accept_fd);
+    return false;
+  }
 
   *server_socket = accept_fd;
   return true;
diff --git a/chrome/common/ipc_tests.scons b/chrome/common/ipc_tests.scons
index 48b098e..d4d534d 100644
--- a/chrome/common/ipc_tests.scons
+++ b/chrome/common/ipc_tests.scons
@@ -81,10 +81,6 @@ input_files = [
     '$BASE_DIR/perftimer$OBJSUFFIX',
 ]
 
-if env['PLATFORM'] == 'posix':
-  # TODO(port): These tests don't work yet.
-  input_files.remove('ipc_fuzzing_tests.cc')
-
 ipc_tests = env.ChromeTestProgram('ipc_tests', input_files)
 i = env.Install('$TARGET_ROOT', ipc_tests)
 Alias('chrome', i)