Index: ipc/mojo/ipc_mojo_bootstrap.cc |
diff --git a/ipc/mojo/ipc_mojo_bootstrap.cc b/ipc/mojo/ipc_mojo_bootstrap.cc |
index 434f002744a5551fb719edb00ee013cadf3b9205..b488dd5ab6148a9b63a347c9ae57b5cd5e54dc29 100644 |
--- a/ipc/mojo/ipc_mojo_bootstrap.cc |
+++ b/ipc/mojo/ipc_mojo_bootstrap.cc |
@@ -7,6 +7,7 @@ |
#include <stdint.h> |
#include <utility> |
+#include "base/callback.h" |
#include "base/logging.h" |
#include "base/macros.h" |
#include "base/memory/ptr_util.h" |
@@ -74,7 +75,7 @@ void MojoServerBootstrap::OnInitDone(int32_t peer_pid) { |
} |
set_state(STATE_READY); |
- bootstrap_.set_connection_error_handler(mojo::Closure()); |
+ bootstrap_.set_connection_error_handler(base::Closure()); |
delegate()->OnPipesAvailable(std::move(send_channel_), |
std::move(receive_channel_request_), peer_pid); |
} |
@@ -93,7 +94,7 @@ class MojoClientBootstrap : public MojoBootstrap, public mojom::Bootstrap { |
void Init(mojom::ChannelAssociatedRequest receive_channel, |
mojom::ChannelAssociatedPtrInfo send_channel, |
int32_t peer_pid, |
- const mojo::Callback<void(int32_t)>& callback) override; |
+ const InitCallback& callback) override; |
mojo::Binding<mojom::Bootstrap> binding_; |
@@ -111,10 +112,10 @@ void MojoClientBootstrap::Connect() { |
void MojoClientBootstrap::Init(mojom::ChannelAssociatedRequest receive_channel, |
mojom::ChannelAssociatedPtrInfo send_channel, |
int32_t peer_pid, |
- const mojo::Callback<void(int32_t)>& callback) { |
+ const InitCallback& callback) { |
callback.Run(GetSelfPID()); |
set_state(STATE_READY); |
- binding_.set_connection_error_handler(mojo::Closure()); |
+ binding_.set_connection_error_handler(base::Closure()); |
delegate()->OnPipesAvailable(std::move(send_channel), |
std::move(receive_channel), peer_pid); |
} |