Revert of Implement ScopedFD in terms of ScopedGeneric.

net/test/spawned_test_server/local_test_server_posix.cc

 // Copyright (c) 2012 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 "net/test/spawned_test_server/local_test_server.h"
 
 #include <poll.h>
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/process/process_iterator.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "net/test/python_utils.h"
 
 namespace {
@@ skipping 90 matching lines @@
   if (!AddCommandLineArguments(&python_command))
     return false;
 
   int pipefd[2];
   if (pipe(pipefd) != 0) {
     PLOG(ERROR) << "Could not create pipe.";
     return false;
   }
 
   // Save the read half. The write half is sent to the child.
-  child_fd_.reset(pipefd[0]);
-  base::ScopedFD write_closer(pipefd[1]);
+  child_fd_ = pipefd[0];
+  child_fd_closer_.reset(&child_fd_);
+  file_util::ScopedFD write_closer(&pipefd[1]);
   base::FileHandleMappingVector map_write_fd;
   map_write_fd.push_back(std::make_pair(pipefd[1], pipefd[1]));
 
   python_command.AppendArg("--startup-pipe=" + base::IntToString(pipefd[1]));
 
   // Try to kill any orphaned testserver processes that may be running.
   OrphanedTestServerFilter filter(testserver_path.value(),
                                   base::IntToString(GetPort()));
   if (!base::KillProcesses("python", -1, &filter)) {
     LOG(WARNING) << "Failed to clean up older orphaned testserver instances.";
   }
 
   // Launch a new testserver process.
   base::LaunchOptions options;
 
   options.fds_to_remap = &map_write_fd;
   if (!base::LaunchProcess(python_command, options, &process_handle_)) {
     LOG(ERROR) << "Failed to launch " << python_command.GetCommandLineString();
     return false;
   }
 
   return true;
 }
 
 bool LocalTestServer::WaitToStart() {
-  base::ScopedFD our_fd(child_fd_.release());
+  file_util::ScopedFD child_fd_closer(child_fd_closer_.release());
 
   base::TimeDelta remaining_time = TestTimeouts::action_timeout();
 
   uint32 server_data_len = 0;
-  if (!ReadData(our_fd.get(), sizeof(server_data_len),
+  if (!ReadData(child_fd_, sizeof(server_data_len),
                 reinterpret_cast<uint8*>(&server_data_len),
                 &remaining_time)) {
     LOG(ERROR) << "Could not read server_data_len";
     return false;
   }
   std::string server_data(server_data_len, '\0');
-  if (!ReadData(our_fd.get(), server_data_len,
+  if (!ReadData(child_fd_, server_data_len,
                 reinterpret_cast<uint8*>(&server_data[0]),
                 &remaining_time)) {
     LOG(ERROR) << "Could not read server_data (" << server_data_len
                << " bytes)";
     return false;
   }
 
   if (!ParseServerData(server_data)) {
     LOG(ERROR) << "Could not parse server_data: " << server_data;
     return false;
   }
 
   return true;
 }
 
 }  // namespace net