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

components/nacl/loader/nacl_helper_linux.cc

Index: components/nacl/loader/nacl_helper_linux.cc
diff --git a/components/nacl/loader/nacl_helper_linux.cc b/components/nacl/loader/nacl_helper_linux.cc
index 55b6c0606a08cb927518dfab129695a96db14a70..37e0dd545592f553d10f8a8db4a0bd463d1a447c 100644
--- a/components/nacl/loader/nacl_helper_linux.cc
+++ b/components/nacl/loader/nacl_helper_linux.cc
@@ -50,7 +50,7 @@ void BecomeNaClLoader(const std::vector<int>& child_fds,
                       const NaClLoaderSystemInfo& system_info) {
   VLOG(1) << "NaCl loader: setting up IPC descriptor";
   // don't need zygote FD any more
-  if (HANDLE_EINTR(close(kNaClZygoteDescriptor)) != 0)
+  if (IGNORE_EINTR(close(kNaClZygoteDescriptor)) != 0)
     LOG(ERROR) << "close(kNaClZygoteDescriptor) failed.";
   bool sandbox_initialized = InitializeBpfSandbox();
   if (!sandbox_initialized) {
@@ -98,9 +98,9 @@ void ChildNaClLoaderInit(const std::vector<int>& child_fds,
       validack = true;
     }
   }
-  if (HANDLE_EINTR(close(dummy_fd)) != 0)
+  if (IGNORE_EINTR(close(dummy_fd)) != 0)
     LOG(ERROR) << "close(dummy_fd) failed";
-  if (HANDLE_EINTR(close(parent_fd)) != 0)
+  if (IGNORE_EINTR(close(parent_fd)) != 0)
     LOG(ERROR) << "close(parent_fd) failed";
   if (validack) {
     BecomeNaClLoader(child_fds, system_info);
@@ -137,7 +137,7 @@ bool HandleForkRequest(const std::vector<int>& child_fds,
   // First, close the dummy_fd so the sandbox won't find me when
   // looking for the child's pid in /proc. Also close other fds.
   for (size_t i = 0; i < child_fds.size(); i++) {
-    if (HANDLE_EINTR(close(child_fds[i])) != 0)
+    if (IGNORE_EINTR(close(child_fds[i])) != 0)
       LOG(ERROR) << "close(child_fds[i]) failed";
   }
   VLOG(1) << "nacl_helper: child_pid is " << child_pid;
@@ -180,7 +180,7 @@ bool HandleGetTerminationStatusRequest(PickleIterator* input_iter,
 bool IsSandboxed() {
   int proc_fd = open("/proc/self/exe", O_RDONLY);
   if (proc_fd >= 0) {
-    HANDLE_EINTR(close(proc_fd));
+    close(proc_fd);
     return false;
   }
   return true;