Revert of Implement ScopedFD in terms of ScopedGeneric.

base/posix/unix_domain_socket_linux_unittest.cc

Index: base/posix/unix_domain_socket_linux_unittest.cc
diff --git a/base/posix/unix_domain_socket_linux_unittest.cc b/base/posix/unix_domain_socket_linux_unittest.cc
index bb7154fe5e971d568fbaacaf86a2bbee1bd0921a..22bb172ad5b1b912460b613382018db9be22af68 100644
--- a/base/posix/unix_domain_socket_linux_unittest.cc
+++ b/base/posix/unix_domain_socket_linux_unittest.cc
@@ -9,7 +9,6 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
-#include "base/files/scoped_file.h"
 #include "base/pickle.h"
 #include "base/posix/unix_domain_socket_linux.h"
 #include "base/synchronization/waitable_event.h"
@@ -26,8 +25,8 @@
 
   int fds[2];
   ASSERT_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
-  ScopedFD scoped_fd0(fds[0]);
-  ScopedFD scoped_fd1(fds[1]);
+  file_util::ScopedFD scoped_fd0(&fds[0]);
+  file_util::ScopedFD scoped_fd1(&fds[1]);
 
   // Have the thread send a synchronous message via the socket.
   Pickle request;
@@ -63,7 +62,7 @@
   ASSERT_EQ(0, sigaction(SIGPIPE, &act, &oldact));
   int fds[2];
   ASSERT_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
-  ScopedFD scoped_fd1(fds[1]);
+  file_util::ScopedFD scoped_fd1(&fds[1]);
   ASSERT_EQ(0, IGNORE_EINTR(close(fds[0])));
 
   // Have the thread send a synchronous message via the socket. Unless the