Index: mojo/edk/system/dispatcher_unittest.cc |
diff --git a/third_party/mojo/src/mojo/edk/system/dispatcher_unittest.cc b/mojo/edk/system/dispatcher_unittest.cc |
similarity index 98% |
copy from third_party/mojo/src/mojo/edk/system/dispatcher_unittest.cc |
copy to mojo/edk/system/dispatcher_unittest.cc |
index c6431ffea7b71302fad99b0bcbe46003b5afd2d2..7c2ea062dc43e1935ac93c6db5eb9fff9d43790c 100644 |
--- a/third_party/mojo/src/mojo/edk/system/dispatcher_unittest.cc |
+++ b/mojo/edk/system/dispatcher_unittest.cc |
@@ -15,7 +15,7 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
namespace mojo { |
-namespace system { |
+namespace edk { |
namespace { |
// Trivial subclass that makes the constructor public. |
@@ -31,7 +31,7 @@ class TrivialDispatcher final : public Dispatcher { |
scoped_refptr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock() |
override { |
- mutex().AssertHeld(); |
+ lock().AssertAcquired(); |
return scoped_refptr<Dispatcher>(new TrivialDispatcher()); |
} |
@@ -204,7 +204,7 @@ class ThreadSafetyStressThread : public base::SimpleThread { |
break; |
} |
case MAP_BUFFER: { |
- scoped_ptr<embedder::PlatformSharedBufferMapping> unused; |
+ scoped_ptr<PlatformSharedBufferMapping> unused; |
EXPECT_EQ( |
MOJO_RESULT_INVALID_ARGUMENT, |
dispatcher_->MapBuffer(0u, 0u, MOJO_MAP_BUFFER_FLAG_NONE, &unused)); |
@@ -303,5 +303,5 @@ TEST(DispatcherTest, ThreadSafetyStressNoClose) { |
} |
} // namespace |
-} // namespace system |
+} // namespace edk |
} // namespace mojo |