Update from https://crrev.com/316786

sandbox/linux/services/proc_util.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/proc_util.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/posix/eintr_wrapper.h"
 #include "base/strings/string_number_conversions.h"
 
 namespace sandbox {
 namespace {
 
 struct DIRCloser {
   void operator()(DIR* d) const {
     DCHECK(d);
     PCHECK(0 == closedir(d));
   }
 };
 
 typedef scoped_ptr<DIR, DIRCloser> ScopedDIR;
 
 }  // namespace
 
 int ProcUtil::CountOpenFds(int proc_fd) {
   DCHECK_LE(0, proc_fd);
-  int proc_self_fd = openat(proc_fd, "self/fd", O_DIRECTORY | O_RDONLY);
+  int proc_self_fd = HANDLE_EINTR(
+      openat(proc_fd, "self/fd", O_DIRECTORY | O_RDONLY | O_CLOEXEC));
   PCHECK(0 <= proc_self_fd);
 
   // Ownership of proc_self_fd is transferred here, it must not be closed
   // or modified afterwards except via dir.
   ScopedDIR dir(fdopendir(proc_self_fd));
   CHECK(dir);
 
   int count = 0;
   struct dirent e;
   struct dirent* de;
@@ skipping 57 matching lines @@
     CHECK(fstatat(proc_self_fd, e.d_name, &s, 0) == 0);
     if (S_ISDIR(s.st_mode)) {
       return true;
     }
   }
 
   // No open unmanaged directories found.
   return false;
 }
 
+//static
+base::ScopedFD ProcUtil::OpenProcSelfTask() {
+  base::ScopedFD proc_self_task(
+   HANDLE_EINTR(
+      open("/proc/self/task/", O_RDONLY | O_DIRECTORY | O_CLOEXEC)));
+  PCHECK(proc_self_task.is_valid());
+  return proc_self_task.Pass();
+}
+
 }  // namespace sandbox