Revert of Implement ScopedFD in terms of ScopedGeneric.

content/child/npapi/np_channel_base.cc

Index: content/child/npapi/np_channel_base.cc
diff --git a/content/child/npapi/np_channel_base.cc b/content/child/npapi/np_channel_base.cc
index 76845bd8f21a9707079d201782c4ea9414747157..85ade5a2539e5acbe728092f14ff89c750372e5e 100644
--- a/content/child/npapi/np_channel_base.cc
+++ b/content/child/npapi/np_channel_base.cc
@@ -6,7 +6,6 @@
 
 #include "base/auto_reset.h"
 #include "base/containers/hash_tables.h"
-#include "base/files/scoped_file.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_local.h"
@@ -69,8 +68,8 @@
   // On POSIX the channel_handle conveys an FD (socket) which is duped by the
   // kernel during the IPC message exchange (via the SCM_RIGHTS mechanism).
   // Ensure we do not leak this FD.
-  base::ScopedFD fd(channel_handle.socket.auto_close ?
-                    channel_handle.socket.fd : -1);
+  int fd = channel_handle.socket.auto_close ? channel_handle.socket.fd : -1;
+  file_util::ScopedFD auto_close_fd(&fd);
 #endif
 
   scoped_refptr<NPChannelBase> channel;
@@ -87,7 +86,7 @@
   if (!channel->channel_valid()) {
     channel->channel_handle_ = channel_handle;
 #if defined(OS_POSIX)
-    ignore_result(fd.release());
+    ignore_result(auto_close_fd.release());
 #endif
     if (mode & IPC::Channel::MODE_SERVER_FLAG) {
       channel->channel_handle_.name =