Revert of Implement ScopedFD in terms of ScopedGeneric.

base/process/kill_posix.cc

Index: base/process/kill_posix.cc
diff --git a/base/process/kill_posix.cc b/base/process/kill_posix.cc
index 8187c38926cd2ce0551861f0e6a09d24db84f8b6..99d70d9ab5590418566be37a047a6aa67ee58247 100644
--- a/base/process/kill_posix.cc
+++ b/base/process/kill_posix.cc
@@ -10,7 +10,6 @@
 #include <unistd.h>
 
 #include "base/file_util.h"
-#include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process/process_iterator.h"
@@ -274,15 +273,16 @@
   DCHECK_GT(handle, 0);
   DCHECK(wait.InMilliseconds() == base::kNoTimeout || wait > base::TimeDelta());
 
-  ScopedFD kq(kqueue());
-  if (!kq.is_valid()) {
+  int kq = kqueue();
+  if (kq == -1) {
     DPLOG(ERROR) << "kqueue";
     return false;
   }
+  file_util::ScopedFD kq_closer(&kq);
 
   struct kevent change = {0};
   EV_SET(&change, handle, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, NULL);
-  int result = HANDLE_EINTR(kevent(kq.get(), &change, 1, NULL, 0, NULL));
+  int result = HANDLE_EINTR(kevent(kq, &change, 1, NULL, 0, NULL));
   if (result == -1) {
     if (errno == ESRCH) {
       // If the process wasn't found, it must be dead.
@@ -316,7 +316,7 @@
       remaining_timespec_ptr = &remaining_timespec;
     }
 
-    result = kevent(kq.get(), NULL, 0, &event, 1, remaining_timespec_ptr);
+    result = kevent(kq, NULL, 0, &event, 1, remaining_timespec_ptr);
 
     if (result == -1 && errno == EINTR) {
       if (!wait_forever) {