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

chromeos/process_proxy/process_output_watcher_unittest.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 <gtest/gtest.h>
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 109 matching lines @@
       EXPECT_EQ(test_size,
                 file_util::WriteFileDescriptor(pt_pipe[1], test_str.c_str(),
                                                test_size));
     }
 
     all_data_received_->Wait();
 
     // 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();
   }
 
   scoped_ptr<base::WaitableEvent> all_data_received_;
 
  private:
   ProcessWatcherExpectations expectations_;
   std::vector<TestCase> exp;
 };
@@ skipping 20 matching lines @@
   // This will send '\0' to output wathcer.
   test_cases.push_back(TestCase("", true));
   // Let's verify that next input also gets detected (i.e. output watcher does
   // not exit after seeing '\0' from previous test case).
   test_cases.push_back(TestCase("a", true));
 
   RunTest(test_cases);
 };
 
 }  // namespace chromeos