1 files changed, 6 insertions, 7 deletions
diff --git a/chromium/content/common/sandbox_mac_system_access_unittest.mm b/chromium/content/common/sandbox_mac_system_access_unittest.mm
index 09ac85485d2..c527ea5be29 100644
--- a/chromium/content/common/sandbox_mac_system_access_unittest.mm
+++ b/chromium/content/common/sandbox_mac_system_access_unittest.mm
@@ -5,6 +5,7 @@
 #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"
@@ -86,9 +87,8 @@ class MacSandboxedFileAccessTestCase : public MacSandboxTestCase {
 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(HANDLE_EINTR(open("/etc/passwd", O_RDONLY)));
+  return !fdes.is_valid();
 }
 
 TEST_F(MacSandboxTest, FileAccess) {
@@ -105,15 +105,14 @@ class MacSandboxedUrandomTestCase : public MacSandboxTestCase {
 REGISTER_SANDBOX_TEST_CASE(MacSandboxedUrandomTestCase);
 
 bool MacSandboxedUrandomTestCase::SandboxedTest() {
-  int fdes = open("/dev/urandom", O_RDONLY);
-  file_util::ScopedFD file_closer(&fdes);
+  base::ScopedFD fdes(HANDLE_EINTR(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 = HANDLE_EINTR(read(fdes.get(), buf, sizeof(buf)));
   return rc == sizeof(buf);
 }