Index: third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc |
diff --git a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc |
index 8ab8f10684938a18d05a46bfaf915f184fea5485..caf8e0b64bfb313975c6cdef71a6a4d3e283ca34 100644 |
--- a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc |
+++ b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc |
@@ -177,14 +177,14 @@ MojoResult SharedBufferDispatcher::ValidateDuplicateOptions( |
} |
void SharedBufferDispatcher::CloseImplNoLock() { |
- lock().AssertAcquired(); |
+ mutex().AssertHeld(); |
DCHECK(shared_buffer_); |
shared_buffer_ = nullptr; |
} |
scoped_refptr<Dispatcher> |
SharedBufferDispatcher::CreateEquivalentDispatcherAndCloseImplNoLock() { |
- lock().AssertAcquired(); |
+ mutex().AssertHeld(); |
DCHECK(shared_buffer_); |
return CreateInternal(shared_buffer_.Pass()); |
} |
@@ -192,7 +192,7 @@ SharedBufferDispatcher::CreateEquivalentDispatcherAndCloseImplNoLock() { |
MojoResult SharedBufferDispatcher::DuplicateBufferHandleImplNoLock( |
UserPointer<const MojoDuplicateBufferHandleOptions> options, |
scoped_refptr<Dispatcher>* new_dispatcher) { |
- lock().AssertAcquired(); |
+ mutex().AssertHeld(); |
MojoDuplicateBufferHandleOptions validated_options; |
MojoResult result = ValidateDuplicateOptions(options, &validated_options); |
@@ -209,7 +209,7 @@ MojoResult SharedBufferDispatcher::MapBufferImplNoLock( |
uint64_t num_bytes, |
MojoMapBufferFlags flags, |
scoped_ptr<embedder::PlatformSharedBufferMapping>* mapping) { |
- lock().AssertAcquired(); |
+ mutex().AssertHeld(); |
DCHECK(shared_buffer_); |
if (offset > static_cast<uint64_t>(std::numeric_limits<size_t>::max())) |