Implement ScopedFD in terms of ScopedGeneric.

sandbox/linux/services/yama.cc

 // Copyright 2014 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 "sandbox/linux/services/yama.h"
 
 #include <fcntl.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 
 #if !defined(PR_SET_PTRACER_ANY)
 #define PR_SET_PTRACER_ANY ((unsigned long)-1)
 #endif
 
 #if !defined(PR_SET_PTRACER)
 #define PR_SET_PTRACER 0x59616d61
 #endif
@@ skipping 46 matching lines @@
 }
 
 // static
 int Yama::GetStatus() {
   if (!CanAccessProcFS()) {
     return 0;
   }
 
   static const char kPtraceScopePath[] = "/proc/sys/kernel/yama/ptrace_scope";
 
-  int yama_scope = open(kPtraceScopePath, O_RDONLY);
+  base::ScopedFD yama_scope(open(kPtraceScopePath, O_RDONLY));

[agl, 2014/03/18 06:52:05]

HANDLE_EINTR

 
-  if (yama_scope < 0) {
+  if (!yama_scope.is_valid()) {
     const int open_errno = errno;
     DCHECK(ENOENT == open_errno);
     // The status is known, yama is not present.
     return STATUS_KNOWN;
   }
 
-  file_util::ScopedFDCloser yama_scope_closer(&yama_scope);
   char yama_scope_value = 0;
-  ssize_t num_read = read(yama_scope, &yama_scope_value, 1);
+  ssize_t num_read = read(yama_scope.get(), &yama_scope_value, 1);

[agl, 2014/03/18 06:52:05]

HANDLE_EINTR

   PCHECK(1 == num_read);
 
   switch (yama_scope_value) {
     case '0':
       return STATUS_KNOWN | STATUS_PRESENT;
     case '1':
       return STATUS_KNOWN | STATUS_PRESENT | STATUS_ENFORCING;
     case '2':
     case '3':
       return STATUS_KNOWN | STATUS_PRESENT | STATUS_ENFORCING |
              STATUS_STRICT_ENFORCING;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 // static
 bool Yama::IsPresent() { return GetStatus() & STATUS_PRESENT; }
 
 // static
 bool Yama::IsEnforcing() { return GetStatus() & STATUS_ENFORCING; }
 
 }  // namespace sandbox