Implement ScopedFD in terms of ScopedGeneric.

base/debug/proc_maps_linux.cc

 // Copyright (c) 2013 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 "base/debug/proc_maps_linux.h"
 
 #include <fcntl.h>
 
 #if defined(OS_LINUX)
 #include <inttypes.h>
 #endif
 
 #include "base/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/strings/string_split.h"
 
 #if defined(OS_ANDROID)
 // Bionic's inttypes.h defines PRI/SCNxPTR as an unsigned long int, which
 // is incompatible with Bionic's stdint.h defining uintptr_t as a unsigned int:
 // https://code.google.com/p/android/issues/detail?id=57218
 #undef SCNxPTR
 #define SCNxPTR "x"
 #endif
 
@@ skipping 14 matching lines @@
   // get duplicate entires.
   return false;
 #endif
 }
 
 bool ReadProcMaps(std::string* proc_maps) {
   // seq_file only writes out a page-sized amount on each call. Refer to header
   // file for details.
   const long kReadSize = sysconf(_SC_PAGESIZE);
 
-  int fd = HANDLE_EINTR(open("/proc/self/maps", O_RDONLY));
-  if (fd == -1) {
+  base::ScopedFD fd(HANDLE_EINTR(open("/proc/self/maps", O_RDONLY)));
+  if (!fd.is_valid()) {
     DPLOG(ERROR) << "Couldn't open /proc/self/maps";
     return false;
   }
-  file_util::ScopedFD fd_closer(&fd);
   proc_maps->clear();
 
   while (true) {
     // To avoid a copy, resize |proc_maps| so read() can write directly into it.
     // Compute |buffer| afterwards since resize() may reallocate.
     size_t pos = proc_maps->size();
     proc_maps->resize(pos + kReadSize);
     void* buffer = &(*proc_maps)[pos];
 
-    ssize_t bytes_read = HANDLE_EINTR(read(fd, buffer, kReadSize));
+    ssize_t bytes_read = HANDLE_EINTR(read(fd.get(), buffer, kReadSize));
     if (bytes_read < 0) {
       DPLOG(ERROR) << "Couldn't read /proc/self/maps";
       proc_maps->clear();
       return false;
     }
 
     // ... and don't forget to trim off excess bytes.
     proc_maps->resize(pos + bytes_read);
 
     if (bytes_read == 0)
@@ skipping 79 matching lines @@
     regions.push_back(region);
     regions.back().path.assign(line + path_index);
   }
 
   regions_out->swap(regions);
   return true;
 }
 
 }  // namespace debug
 }  // namespace base