| Index: mojo/edk/system/dispatcher.cc
|
| diff --git a/mojo/edk/system/dispatcher.cc b/mojo/edk/system/dispatcher.cc
|
| index f3ef810d28b5d917dba9163813cc934bcc7734f5..f143d5706cf734a8b414804ae6c0f8e059b0b0cf 100644
|
| --- a/mojo/edk/system/dispatcher.cc
|
| +++ b/mojo/edk/system/dispatcher.cc
|
| @@ -8,6 +8,7 @@
|
| #include "mojo/edk/system/configuration.h"
|
| #include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
|
| #include "mojo/edk/system/data_pipe_producer_dispatcher.h"
|
| +#include "mojo/edk/system/handle_transport.h"
|
| #include "mojo/edk/system/message_pipe_dispatcher.h"
|
| #include "mojo/edk/system/platform_handle_dispatcher.h"
|
| #include "mojo/edk/system/shared_buffer_dispatcher.h"
|
| @@ -29,8 +30,6 @@ DispatcherTransport DispatcherTryStartTransport(Dispatcher* dispatcher) {
|
|
|
| } // namespace test
|
|
|
| -// Dispatcher ------------------------------------------------------------------
|
| -
|
| // TODO(vtl): The thread-safety analyzer isn't smart enough to deal with the
|
| // fact that we give up if |TryLock()| fails.
|
| // static
|
| @@ -300,8 +299,7 @@ void Dispatcher::RemoveAwakable(Awakable* awakable,
|
| RemoveAwakableImplNoLock(awakable, handle_signals_state);
|
| }
|
|
|
| -Dispatcher::Dispatcher() : is_closed_(false) {
|
| -}
|
| +Dispatcher::Dispatcher() : is_closed_(false) {}
|
|
|
| Dispatcher::~Dispatcher() {
|
| // Make sure that |Close()| was called.
|
| @@ -573,13 +571,5 @@ bool Dispatcher::EndSerializeAndClose(
|
| platform_handles);
|
| }
|
|
|
| -// DispatcherTransport ---------------------------------------------------------
|
| -
|
| -void DispatcherTransport::End() {
|
| - DCHECK(dispatcher_);
|
| - dispatcher_->mutex_.Unlock();
|
| - dispatcher_ = nullptr;
|
| -}
|
| -
|
| } // namespace system
|
| } // namespace mojo
|
|
|