Clean up locking.

native_client_sdk/src/libraries/nacl_io_test/kernel_proxy_test.cc

 /* 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.
  */
 
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <sys/stat.h>
 
@@ skipping 20 matching lines @@
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::SetArgPointee;
 using ::testing::StrEq;
 using ::testing::WithArgs;
 
 namespace {
 
 class KernelProxyFriend : public KernelProxy {
  public:
-  Mount* RootMount() { return mounts_["/"].get(); }
+  Mount* RootMount() {
+    ScopedMount mnt;
+    Path path;
+
+    AcquireMountAndRelPath("/", &mnt, &path);
+    return mnt.get();
+  }
 };
 
 class KernelProxyTest : public ::testing::Test {
  public:
   KernelProxyTest() : kp_(new KernelProxyFriend) {
     ki_init(kp_);
     // Unmount the passthrough FS and mount a memfs.
     EXPECT_EQ(0, kp_->umount("/"));
     EXPECT_EQ(0, kp_->mount("", "/", "memfs", 0, NULL));
   }
@@ skipping 441 matching lines @@
 
   int fd = ki_open("/dummy", O_RDONLY);
   EXPECT_NE(0, fd);
 
   char buf[20];
   EXPECT_EQ(-1, ki_read(fd, &buf[0], 20));
   // The Mount should be able to return whatever error it wants and have it
   // propagate through.
   EXPECT_EQ(1234, errno);
 }