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

chromeos/dbus/debug_daemon_client.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 <fcntl.h>
 #include <unistd.h>
 
 #include "chromeos/dbus/debug_daemon_client.h"
 
 #include "base/bind.h"
@@ skipping 34 matching lines @@
   explicit PipeReader(IOCompleteCallback callback)
       : io_buffer_(new net::IOBufferWithSize(4096)),
         callback_(callback),
         weak_ptr_factory_(this) {
     pipe_fd_[0] = pipe_fd_[1] = -1;
   }
 
   virtual ~PipeReader() {
     // Don't close pipe_fd_[0] as it's closed by data_stream_.
     if (pipe_fd_[1] != -1)
-      if (HANDLE_EINTR(close(pipe_fd_[1])) < 0)
+      if (IGNORE_EINTR(close(pipe_fd_[1])) < 0)
         PLOG(ERROR) << "close[1]";
   }
 
   // Returns descriptor for the writeable side of the pipe.
   int GetWriteFD() { return pipe_fd_[1]; }
 
   // Closes writeable descriptor; normally used in parent process after fork.
   void CloseWriteFD() {
     if (pipe_fd_[1] != -1) {
-      if (HANDLE_EINTR(close(pipe_fd_[1])) < 0)
+      if (IGNORE_EINTR(close(pipe_fd_[1])) < 0)
         PLOG(ERROR) << "close";
       pipe_fd_[1] = -1;
     }
   }
 
   // Returns collected data.
   std::string* data() { return &data_; }
 
   // Starts data collection.  Returns true if stream was setup correctly.
   // On success data will automatically be accumulated into a string that
@@ skipping 643 matching lines @@
 // static
 DebugDaemonClient* DebugDaemonClient::Create(
     DBusClientImplementationType type) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new DebugDaemonClientImpl();
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new DebugDaemonClientStubImpl();
 }
 
 }  // namespace chromeos