Revert of Implement ScopedFD in terms of ScopedGeneric.

content/browser/zygote_host/zygote_host_impl_linux.cc

Index: content/browser/zygote_host/zygote_host_impl_linux.cc
diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
index aaf4d3b686e916a53f217bad0a33bc043a191f23..18e9b69309436b5c5ad924fea2939807e5c66a7e 100644
--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
@@ -14,7 +14,6 @@
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
-#include "base/files/scoped_file.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ -319,7 +318,7 @@
   std::vector<int> fds;
   // Scoped pointers cannot be stored in containers, so we have to use a
   // linked_ptr.
-  std::vector<linked_ptr<base::ScopedFD> > autodelete_fds;
+  std::vector<linked_ptr<file_util::ScopedFD> > autodelete_fds;
   for (std::vector<FileDescriptorInfo>::const_iterator
        i = mapping.begin(); i != mapping.end(); ++i) {
     pickle.WriteUInt32(i->id);
@@ -327,7 +326,8 @@
     if (i->fd.auto_close) {
       // Auto-close means we need to close the FDs after they have been passed
       // to the other process.
-      linked_ptr<base::ScopedFD> ptr(new base::ScopedFD(fds.back()));
+      linked_ptr<file_util::ScopedFD> ptr(
+          new file_util::ScopedFD(&(fds.back())));
       autodelete_fds.push_back(ptr);
     }
   }