Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

sandbox/linux/services/proc_util_unittest.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 <fcntl.h>
 #include <unistd.h>
 
 #include "base/files/scoped_file.h"
@@ skipping 10 matching lines @@
   ASSERT_LE(0, fd);
   EXPECT_EQ(fd_count + 1, ProcUtil::CountOpenFds(proc_fd.get()));
   ASSERT_EQ(0, IGNORE_EINTR(close(fd)));
   EXPECT_EQ(fd_count, ProcUtil::CountOpenFds(proc_fd.get()));
 }
 
 TEST(ProcUtil, HasOpenDirectory) {
   // No open directory should exist at startup.
   EXPECT_FALSE(ProcUtil::HasOpenDirectory(-1));
   {
-    // Have a "/proc" file descriptor around.
-    int proc_fd = open("/proc", O_RDONLY | O_DIRECTORY);
-    base::ScopedFD proc_fd_closer(proc_fd);
+    // Have a "/dev" file descriptor around.
+    int dev_fd = open("/dev", O_RDONLY | O_DIRECTORY);
+    base::ScopedFD dev_fd_closer(dev_fd);
     EXPECT_TRUE(ProcUtil::HasOpenDirectory(-1));
   }
   EXPECT_FALSE(ProcUtil::HasOpenDirectory(-1));
 }
 
 TEST(ProcUtil, HasOpenDirectoryWithFD) {
   int proc_fd = open("/proc", O_RDONLY | O_DIRECTORY);
   base::ScopedFD proc_fd_closer(proc_fd);
   ASSERT_LE(0, proc_fd);
 
   // Don't pass |proc_fd|, an open directory (proc_fd) should
   // be detected.
   EXPECT_TRUE(ProcUtil::HasOpenDirectory(-1));
   // Pass |proc_fd| and no open directory should be detected.
   EXPECT_FALSE(ProcUtil::HasOpenDirectory(proc_fd));
 
   {
-    // Have a directory file descriptor around.
-    int open_directory_fd = open("/proc/self", O_RDONLY | O_DIRECTORY);
-    base::ScopedFD open_directory_fd_closer(open_directory_fd);
+    // Have a "/dev" file descriptor around.
+    int dev_fd = open("/dev", O_RDONLY | O_DIRECTORY);
+    base::ScopedFD dev_fd_closer(dev_fd);
     EXPECT_TRUE(ProcUtil::HasOpenDirectory(proc_fd));
   }
 
-  // The "/proc/self" file descriptor should now be closed, |proc_fd| is the
-  // only directory file descriptor open.
+  // The "/dev" file descriptor should now be closed, |proc_fd| is the only
+  // directory file descriptor open.
   EXPECT_FALSE(ProcUtil::HasOpenDirectory(proc_fd));
 }
 
 }  // namespace sandbox