Index: third_party/mojo/src/mojo/edk/system/core.cc |
diff --git a/third_party/mojo/src/mojo/edk/system/core.cc b/third_party/mojo/src/mojo/edk/system/core.cc |
index 4460088d47fde90a1d5e2905b3614df7ca36b9fb..80c3d367ba16858731d2c0527c4c073a7faee245 100644 |
--- a/third_party/mojo/src/mojo/edk/system/core.cc |
+++ b/third_party/mojo/src/mojo/edk/system/core.cc |
@@ -17,7 +17,6 @@ |
#include "mojo/edk/system/data_pipe_producer_dispatcher.h" |
#include "mojo/edk/system/dispatcher.h" |
#include "mojo/edk/system/handle_signals_state.h" |
-#include "mojo/edk/system/local_data_pipe.h" |
#include "mojo/edk/system/memory.h" |
#include "mojo/edk/system/message_pipe.h" |
#include "mojo/edk/system/message_pipe_dispatcher.h" |
@@ -100,7 +99,7 @@ scoped_refptr<Dispatcher> Core::GetDispatcher(MojoHandle handle) { |
MojoResult Core::AsyncWait(MojoHandle handle, |
MojoHandleSignals signals, |
- base::Callback<void(MojoResult)> callback) { |
+ const base::Callback<void(MojoResult)>& callback) { |
scoped_refptr<Dispatcher> dispatcher = GetDispatcher(handle); |
DCHECK(dispatcher); |
@@ -381,7 +380,7 @@ MojoResult Core::CreateDataPipe( |
} |
DCHECK_NE(handle_pair.second, MOJO_HANDLE_INVALID); |
- scoped_refptr<DataPipe> data_pipe(new LocalDataPipe(validated_options)); |
+ scoped_refptr<DataPipe> data_pipe(DataPipe::CreateLocal(validated_options)); |
producer_dispatcher->Init(data_pipe); |
consumer_dispatcher->Init(data_pipe); |