diff options
Diffstat (limited to 'chromeos/process_proxy')
4 files changed, 4 insertions, 5 deletions
diff --git a/chromeos/process_proxy/process_output_watcher.cc b/chromeos/process_proxy/process_output_watcher.cc index 40ed8cf..f063984 100644 --- a/chromeos/process_proxy/process_output_watcher.cc +++ b/chromeos/process_proxy/process_output_watcher.cc @@ -26,7 +26,7 @@ void InitReadFdSet(int out_fd, int stop_fd, fd_set* set) { void CloseFd(int* fd) { if (*fd >= 0) { - if (HANDLE_EINTR(close(*fd)) != 0) + if (IGNORE_EINTR(close(*fd)) != 0) DPLOG(WARNING) << "close fd " << *fd << " failed."; } *fd = -1; diff --git a/chromeos/process_proxy/process_output_watcher_unittest.cc b/chromeos/process_proxy/process_output_watcher_unittest.cc index 9ff8d89..b45d137 100644 --- a/chromeos/process_proxy/process_output_watcher_unittest.cc +++ b/chromeos/process_proxy/process_output_watcher_unittest.cc @@ -127,8 +127,8 @@ public: // Send stop signal. It is not important which string we send. EXPECT_EQ(1, file_util::WriteFileDescriptor(stop_pipe[1], "q", 1)); - EXPECT_NE(-1, HANDLE_EINTR(close(stop_pipe[1]))); - EXPECT_NE(-1, HANDLE_EINTR(close(pt_pipe[1]))); + EXPECT_NE(-1, IGNORE_EINTR(close(stop_pipe[1]))); + EXPECT_NE(-1, IGNORE_EINTR(close(pt_pipe[1]))); output_watch_thread.Stop(); } diff --git a/chromeos/process_proxy/process_proxy.cc b/chromeos/process_proxy/process_proxy.cc index b61ec9f..3ae1d21 100644 --- a/chromeos/process_proxy/process_proxy.cc +++ b/chromeos/process_proxy/process_proxy.cc @@ -244,7 +244,7 @@ void ProcessProxy::CloseFdPair(int* pipe) { void ProcessProxy::CloseFd(int* fd) { if (*fd != kInvalidFd) { - if (HANDLE_EINTR(close(*fd)) != 0) + if (IGNORE_EINTR(close(*fd)) != 0) DPLOG(WARNING) << "close fd failed."; } *fd = kInvalidFd; diff --git a/chromeos/process_proxy/process_proxy_unittest.cc b/chromeos/process_proxy/process_proxy_unittest.cc index 429c868..badb7dc 100644 --- a/chromeos/process_proxy/process_proxy_unittest.cc +++ b/chromeos/process_proxy/process_proxy_unittest.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/posix/eintr_wrapper.h" #include "base/process/kill.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" |