Implement ScopedFD in terms of ScopedGeneric.

content/common/sandbox_mac_system_access_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "content/common/sandbox_mac.h"
 #include "content/common/sandbox_mac_unittest_helper.h"
 #include "crypto/nss_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 //--------------------- Clipboard Sandboxing ----------------------
@@ skipping 61 matching lines @@
 //--------------------- File Access Sandboxing ----------------------
 // Test case for checking sandboxing of filesystem apis.
 class MacSandboxedFileAccessTestCase : public MacSandboxTestCase {
  public:
   virtual bool SandboxedTest() OVERRIDE;
 };
 
 REGISTER_SANDBOX_TEST_CASE(MacSandboxedFileAccessTestCase);
 
 bool MacSandboxedFileAccessTestCase::SandboxedTest() {
-  int fdes = open("/etc/passwd", O_RDONLY);
-  file_util::ScopedFD file_closer(&fdes);
-  return fdes == -1;
+  base::ScopedFD fdes(open("/etc/passwd", O_RDONLY));

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

This, line 115 and line 108 should also have HANDLE_EINTR.

+  return !fdes.is_valid();
 }
 
 TEST_F(MacSandboxTest, FileAccess) {
   EXPECT_TRUE(RunTestInAllSandboxTypes("MacSandboxedFileAccessTestCase", NULL));
 }
 
 //--------------------- /dev/urandom Sandboxing ----------------------
 // /dev/urandom is available to any sandboxed process.
 class MacSandboxedUrandomTestCase : public MacSandboxTestCase {
  public:
   virtual bool SandboxedTest() OVERRIDE;
 };
 
 REGISTER_SANDBOX_TEST_CASE(MacSandboxedUrandomTestCase);
 
 bool MacSandboxedUrandomTestCase::SandboxedTest() {
-  int fdes = open("/dev/urandom", O_RDONLY);
-  file_util::ScopedFD file_closer(&fdes);
+  base::ScopedFD fdes(open("/dev/urandom", O_RDONLY));
 
   // Opening /dev/urandom succeeds under the sandbox.
-  if (fdes == -1)
+  if (!fdes.is_valid())
     return false;
 
   char buf[16];
-  int rc = read(fdes, buf, sizeof(buf));
+  int rc = read(fdes.get(), buf, sizeof(buf));
   return rc == sizeof(buf);
 }
 
 TEST_F(MacSandboxTest, UrandomAccess) {
   EXPECT_TRUE(RunTestInAllSandboxTypes("MacSandboxedUrandomTestCase", NULL));
 }
 
 //--------------------- NSS Sandboxing ----------------------
 // Test case for checking sandboxing of NSS initialization.
 class MacSandboxedNSSTestCase : public MacSandboxTestCase {
  public:
   virtual bool SandboxedTest() OVERRIDE;
 };
 
 REGISTER_SANDBOX_TEST_CASE(MacSandboxedNSSTestCase);
 
 bool MacSandboxedNSSTestCase::SandboxedTest() {
   // If NSS cannot read from /dev/urandom, NSS initialization will call abort(),
   // which will cause this test case to fail.
   crypto::ForceNSSNoDBInit();
   crypto::EnsureNSSInit();
   return true;
 }
 
 TEST_F(MacSandboxTest, NSSAccess) {
   EXPECT_TRUE(RunTestInAllSandboxTypes("MacSandboxedNSSTestCase", NULL));
 }
 
 }  // namespace content