Revert of Implement ScopedFD in terms of ScopedGeneric.

chrome/utility/importer/firefox_importer_unittest_utils_mac.cc

Index: chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
diff --git a/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc b/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
index 93961c59d3fec71f7231a5aa52a26c503df52fc6..6b2114970760f27db1f54b90b6ca343562401a89 100644
--- a/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
+++ b/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
@@ -9,7 +9,6 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
-#include "base/files/scoped_file.h"
 #include "base/message_loop/message_loop.h"
 #include "base/posix/global_descriptors.h"
 #include "base/process/kill.h"
@@ -48,12 +47,13 @@
   base::LaunchOptions options;
   options.environ["DYLD_FALLBACK_LIBRARY_PATH"] = nss_path.value();
 
-  base::ScopedFD ipcfd(channel->TakeClientFileDescriptor());
-  if (!ipcfd.is_valid())
+  int ipcfd = channel->TakeClientFileDescriptor();
+  if (ipcfd == -1)
     return false;
 
+  file_util::ScopedFD client_file_descriptor_closer(&ipcfd);
   base::FileHandleMappingVector fds_to_map;
-  fds_to_map.push_back(std::pair<int,int>(ipcfd.get(),
+  fds_to_map.push_back(std::pair<int,int>(ipcfd,
       kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
 
   bool debug_on_start = CommandLine::ForCurrentProcess()->HasSwitch(