| Index: ipc/ipc_mojo_bootstrap.cc
|
| diff --git a/ipc/ipc_mojo_bootstrap.cc b/ipc/ipc_mojo_bootstrap.cc
|
| index 8bf00f12604bb6e3b318b2d2bfc907184e7cbef4..f0867525f6bbdb9212ae1c24c07823c572a10b9c 100644
|
| --- a/ipc/ipc_mojo_bootstrap.cc
|
| +++ b/ipc/ipc_mojo_bootstrap.cc
|
| @@ -587,6 +587,11 @@ class BootstrapMasterBinding {
|
| endpoint_client_->set_connection_error_handler(handler);
|
| }
|
|
|
| + mojo::AssociatedGroup* associated_group() {
|
| + DCHECK(controller_);
|
| + return controller_->associated_group();
|
| + }
|
| +
|
| void Bind(mojo::ScopedMessagePipeHandle handle) {
|
| DCHECK(!controller_);
|
| controller_ =
|
| @@ -617,6 +622,9 @@ class MojoServerBootstrap : public MojoBootstrap {
|
| private:
|
| // MojoBootstrap implementation.
|
| void Connect() override;
|
| + mojo::AssociatedGroup* GetAssociatedGroup() override {
|
| + return bootstrap_.associated_group();
|
| + }
|
|
|
| void OnInitDone(int32_t peer_pid);
|
|
|
| @@ -676,6 +684,9 @@ class MojoClientBootstrap : public MojoBootstrap, public mojom::Bootstrap {
|
| private:
|
| // MojoBootstrap implementation.
|
| void Connect() override;
|
| + mojo::AssociatedGroup* GetAssociatedGroup() override {
|
| + return binding_.associated_group();
|
| + }
|
|
|
| // mojom::Bootstrap implementation.
|
| void Init(mojom::ChannelAssociatedRequest receive_channel,
|
|
|