| Index: mojo/edk/system/data_pipe_consumer_dispatcher.h
|
| diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.h b/mojo/edk/system/data_pipe_consumer_dispatcher.h
|
| index 746d02e4d3aafe75764fcf98fb72ae86ccdb8369..6c7b2ea2c01a689972f27bc038105c7180f76707 100644
|
| --- a/mojo/edk/system/data_pipe_consumer_dispatcher.h
|
| +++ b/mojo/edk/system/data_pipe_consumer_dispatcher.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef MOJO_EDK_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
|
| #define MOJO_EDK_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
|
|
|
| -#include "base/memory/ref_counted.h"
|
| #include "mojo/edk/system/dispatcher.h"
|
| #include "mojo/edk/system/ref_ptr.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| @@ -20,8 +19,8 @@ class DataPipe;
|
| // thread-safe.
|
| class DataPipeConsumerDispatcher final : public Dispatcher {
|
| public:
|
| - static scoped_refptr<DataPipeConsumerDispatcher> Create() {
|
| - return make_scoped_refptr(new DataPipeConsumerDispatcher());
|
| + static RefPtr<DataPipeConsumerDispatcher> Create() {
|
| + return AdoptRef(new DataPipeConsumerDispatcher());
|
| }
|
|
|
| // Must be called before any other methods.
|
| @@ -32,8 +31,9 @@ class DataPipeConsumerDispatcher final : public Dispatcher {
|
|
|
| // The "opposite" of |SerializeAndClose()|. (Typically this is called by
|
| // |Dispatcher::Deserialize()|.)
|
| - static scoped_refptr<DataPipeConsumerDispatcher>
|
| - Deserialize(Channel* channel, const void* source, size_t size);
|
| + static RefPtr<DataPipeConsumerDispatcher> Deserialize(Channel* channel,
|
| + const void* source,
|
| + size_t size);
|
|
|
| // Get access to the |DataPipe| for testing.
|
| DataPipe* GetDataPipeForTest();
|
| @@ -45,8 +45,7 @@ class DataPipeConsumerDispatcher final : public Dispatcher {
|
| // |Dispatcher| protected methods:
|
| void CancelAllAwakablesNoLock() override;
|
| void CloseImplNoLock() override;
|
| - scoped_refptr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock()
|
| - override;
|
| + RefPtr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock() override;
|
| MojoResult ReadDataImplNoLock(UserPointer<void> elements,
|
| UserPointer<uint32_t> num_bytes,
|
| MojoReadDataFlags flags) override;
|
|
|