| Index: mojo/edk/system/data_pipe_producer_dispatcher.h
|
| diff --git a/mojo/edk/system/data_pipe_producer_dispatcher.h b/mojo/edk/system/data_pipe_producer_dispatcher.h
|
| index 77c09aac88c45d0a9264a275bad0a5a8c625a61d..79097d918bdf043cbf0a704d446eb08347295c8c 100644
|
| --- a/mojo/edk/system/data_pipe_producer_dispatcher.h
|
| +++ b/mojo/edk/system/data_pipe_producer_dispatcher.h
|
| @@ -6,7 +6,7 @@
|
| #define MOJO_EDK_SYSTEM_DATA_PIPE_PRODUCER_DISPATCHER_H_
|
|
|
| #include "mojo/edk/system/dispatcher.h"
|
| -#include "mojo/edk/system/ref_ptr.h"
|
| +#include "mojo/edk/util/ref_ptr.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
|
|
| namespace mojo {
|
| @@ -19,21 +19,20 @@ class DataPipe;
|
| // thread-safe.
|
| class DataPipeProducerDispatcher final : public Dispatcher {
|
| public:
|
| - static RefPtr<DataPipeProducerDispatcher> Create() {
|
| + static util::RefPtr<DataPipeProducerDispatcher> Create() {
|
| return AdoptRef(new DataPipeProducerDispatcher());
|
| }
|
|
|
| // Must be called before any other methods.
|
| - void Init(RefPtr<DataPipe>&& data_pipe) MOJO_NOT_THREAD_SAFE;
|
| + void Init(util::RefPtr<DataPipe>&& data_pipe) MOJO_NOT_THREAD_SAFE;
|
|
|
| // |Dispatcher| public methods:
|
| Type GetType() const override;
|
|
|
| // The "opposite" of |SerializeAndClose()|. (Typically this is called by
|
| // |Dispatcher::Deserialize()|.)
|
| - static RefPtr<DataPipeProducerDispatcher> Deserialize(Channel* channel,
|
| - const void* source,
|
| - size_t size);
|
| + static util::RefPtr<DataPipeProducerDispatcher>
|
| + Deserialize(Channel* channel, const void* source, size_t size);
|
|
|
| // Get access to the |DataPipe| for testing.
|
| DataPipe* GetDataPipeForTest();
|
| @@ -45,7 +44,8 @@ class DataPipeProducerDispatcher final : public Dispatcher {
|
| // |Dispatcher| protected methods:
|
| void CancelAllAwakablesNoLock() override;
|
| void CloseImplNoLock() override;
|
| - RefPtr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock() override;
|
| + util::RefPtr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock()
|
| + override;
|
| MojoResult WriteDataImplNoLock(UserPointer<const void> elements,
|
| UserPointer<uint32_t> num_bytes,
|
| MojoWriteDataFlags flags) override;
|
| @@ -73,7 +73,7 @@ class DataPipeProducerDispatcher final : public Dispatcher {
|
| bool IsBusyNoLock() const override;
|
|
|
| // This will be null if closed.
|
| - RefPtr<DataPipe> data_pipe_ MOJO_GUARDED_BY(mutex());
|
| + util::RefPtr<DataPipe> data_pipe_ MOJO_GUARDED_BY(mutex());
|
|
|
| MOJO_DISALLOW_COPY_AND_ASSIGN(DataPipeProducerDispatcher);
|
| };
|
|
|