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

components/nacl/zygote/nacl_fork_delegate_linux.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 "components/nacl/zygote/nacl_fork_delegate_linux.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
@@ skipping 188 matching lines @@
     // nacl_helper_bootstrap from succeeding, with its large address space
     // reservation.
     std::set<int> max_these_limits;
     max_these_limits.insert(RLIMIT_AS);
     options.maximize_rlimits = &max_these_limits;
 
     if (!base::LaunchProcess(argv_to_launch, options, NULL))
       status_ = kNaClHelperLaunchFailed;
     // parent and error cases are handled below
   }
-  if (HANDLE_EINTR(close(fds[1])) != 0)
+  if (IGNORE_EINTR(close(fds[1])) != 0)
     LOG(ERROR) << "close(fds[1]) failed";
   if (status_ == kNaClHelperUnused) {
     const ssize_t kExpectedLength = strlen(kNaClHelperStartupAck);
     char buf[kExpectedLength];
 
     // Wait for ack from nacl_helper, indicating it is ready to help
     const ssize_t nread = HANDLE_EINTR(read(fds[0], buf, sizeof(buf)));
     if (nread == kExpectedLength &&
         memcmp(buf, kNaClHelperStartupAck, nread) == 0) {
       // all is well
       status_ = kNaClHelperSuccess;
       fd_ = fds[0];
       return;
     }
 
     status_ = kNaClHelperAckFailed;
     LOG(ERROR) << "Bad NaCl helper startup ack (" << nread << " bytes)";
   }
   // TODO(bradchen): Make this LOG(ERROR) when the NaCl helper
   // becomes the default.
   fd_ = -1;
-  if (HANDLE_EINTR(close(fds[0])) != 0)
+  if (IGNORE_EINTR(close(fds[0])) != 0)
     LOG(ERROR) << "close(fds[0]) failed";
 }
 
 void NaClForkDelegate::InitialUMA(std::string* uma_name,
                                   int* uma_sample,
                                   int* uma_boundary_value) {
   *uma_name = "NaCl.Client.Helper.InitState";
   *uma_sample = status_;
   *uma_boundary_value = kNaClHelperStatusBoundary;
 }
 
 NaClForkDelegate::~NaClForkDelegate() {
   // side effect of close: delegate process will terminate
   if (status_ == kNaClHelperSuccess) {
-    if (HANDLE_EINTR(close(fd_)) != 0)
+    if (IGNORE_EINTR(close(fd_)) != 0)
       LOG(ERROR) << "close(fd_) failed";
   }
 }
 
 bool NaClForkDelegate::CanHelp(const std::string& process_type,
                                std::string* uma_name,
                                int* uma_sample,
                                int* uma_boundary_value) {
   if (process_type != switches::kNaClLoaderProcess)
     return false;
@@ skipping 85 matching lines @@
   int remote_exit_code;
   if (!iter.ReadInt(&remote_exit_code)) {
     LOG(ERROR) << "GetTerminationStatus: pickle failed";
     return false;
   }
 
   *status = static_cast<base::TerminationStatus>(termination_status);
   *exit_code = remote_exit_code;
   return true;
 }