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

ipc/file_descriptor_set_posix_unittest.cc

 // Copyright (c) 2011 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.
 
 // This test is POSIX only.
 
 #include "ipc/file_descriptor_set_posix.h"
 
 #include <unistd.h>
 #include <fcntl.h>
 
 #include "base/basictypes.h"
 #include "base/posix/eintr_wrapper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Get a safe file descriptor for test purposes.
 int GetSafeFd() {
   return open("/dev/null", O_RDONLY);
 }
 
 // Returns true if fd was already closed.  Closes fd if not closed.
 bool VerifyClosed(int fd) {
   const int duped = dup(fd);
   if (duped != -1) {
-    EXPECT_NE(HANDLE_EINTR(close(duped)), -1);
-    EXPECT_NE(HANDLE_EINTR(close(fd)), -1);
+    EXPECT_NE(IGNORE_EINTR(close(duped)), -1);
+    EXPECT_NE(IGNORE_EINTR(close(fd)), -1);
     return false;
   }
   return true;
 }
 
 // The FileDescriptorSet will try and close some of the descriptor numbers
 // which we given it. This is the base descriptor value. It's great enough such
 // that no real descriptor will accidently be closed.
 static const int kFDBase = 50000;
 
@@ skipping 129 matching lines @@
   scoped_refptr<FileDescriptorSet> set(new FileDescriptorSet);
 
   const int fd = GetSafeFd();
   ASSERT_TRUE(set->AddAndAutoClose(fd));
   set->CommitAll();
 
   ASSERT_TRUE(VerifyClosed(fd));
 }
 
 }  // namespace