Implement ScopedFD in terms of ScopedGeneric.

sandbox/linux/services/scoped_process_unittest.cc

 // Copyright 2014 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 <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "sandbox/linux/services/scoped_process.h"
 #include "sandbox/linux/tests/unit_tests.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
 
@@ skipping 40 matching lines @@
   bool got_signaled = false;
   ASSERT_EQ(0, kill(process.GetPid(), SIGKILL));
   int exit_code = process.WaitForExit(&got_signaled);
   EXPECT_TRUE(got_signaled);
   EXPECT_EQ(SIGKILL, exit_code);
 }
 
 TEST(ScopedProcess, DiesForReal) {
   int pipe_fds[2];
   ASSERT_EQ(0, pipe(pipe_fds));
-  file_util::ScopedFDCloser read_end_closer(pipe_fds);
-  file_util::ScopedFDCloser write_end_closer(pipe_fds + 1);
+  base::ScopedFD read_end_closer(pipe_fds[0]);
+  base::ScopedFD write_end_closer(pipe_fds[1]);
 
   { ScopedProcess process(base::Bind(&DoExit)); }
 
   // Close writing end of the pipe.
-  ASSERT_EQ(0, IGNORE_EINTR(close(pipe_fds[1])));
+  write_end_closer.reset();
   pipe_fds[1] = -1;
 
   ASSERT_EQ(0, fcntl(pipe_fds[0], F_SETFL, O_NONBLOCK));
   char c;
   // If the child process is dead for real, there will be no writing end
   // for this pipe left and read will EOF instead of returning EWOULDBLOCK.
   ASSERT_EQ(0, read(pipe_fds[0], &c, 1));
 }
 
 TEST(ScopedProcess, SynchronizationBasic) {
   ScopedProcess process1(base::Bind(&DoNothing));
   EXPECT_TRUE(process1.WaitForClosureToRun());
 
   ScopedProcess process2(base::Bind(&DoExit));
   // The closure didn't finish running normally. This case is simple enough
   // that process.WaitForClosureToRun() should return false, even though the
   // API does not guarantees that it will return at all.
   EXPECT_FALSE(process2.WaitForClosureToRun());
 }
 
 void SleepInMsAndWriteOneByte(int time_to_sleep, int fd) {
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(time_to_sleep));
   CHECK(1 == write(fd, "1", 1));
 }
 
 TEST(ScopedProcess, SynchronizationWorks) {
   int pipe_fds[2];
   ASSERT_EQ(0, pipe(pipe_fds));
-  file_util::ScopedFDCloser read_end_closer(pipe_fds);
-  file_util::ScopedFDCloser write_end_closer(pipe_fds + 1);
+  base::ScopedFD read_end_closer(pipe_fds[0]);
+  base::ScopedFD write_end_closer(pipe_fds[1]);
 
   // Start a process with a closure that takes a little bit to run.
   ScopedProcess process(
       base::Bind(&SleepInMsAndWriteOneByte, 100, pipe_fds[1]));
   EXPECT_TRUE(process.WaitForClosureToRun());
 
   // Verify that the closure did, indeed, run.
   ASSERT_EQ(0, fcntl(pipe_fds[0], F_SETFL, O_NONBLOCK));
   char c = 0;
   EXPECT_EQ(1, read(pipe_fds[0], &c, 1));
   EXPECT_EQ('1', c);
 }
 
 }  // namespace
 
 }  // namespace sandbox