| Index: ipc/ipc_mojo_bootstrap.cc
|
| diff --git a/ipc/ipc_mojo_bootstrap.cc b/ipc/ipc_mojo_bootstrap.cc
|
| index 21e7ca379dc3640cafb8746f7ba8ecbd2d78fd07..e253039e9f336df22dd25869c97dfefc872d6358 100644
|
| --- a/ipc/ipc_mojo_bootstrap.cc
|
| +++ b/ipc/ipc_mojo_bootstrap.cc
|
| @@ -48,8 +48,7 @@ class ChannelAssociatedGroupController
|
| ChannelAssociatedGroupController(
|
| bool set_interface_id_namespace_bit,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner)
|
| - : mojo::AssociatedGroupController(base::ThreadTaskRunnerHandle::Get()),
|
| - task_runner_(ipc_task_runner),
|
| + : task_runner_(ipc_task_runner),
|
| proxy_task_runner_(base::ThreadTaskRunnerHandle::Get()),
|
| set_interface_id_namespace_bit_(set_interface_id_namespace_bit),
|
| header_validator_(
|
| @@ -345,6 +344,8 @@ class ChannelAssociatedGroupController
|
| };
|
|
|
| ~ChannelAssociatedGroupController() override {
|
| + DCHECK(!connector_);
|
| +
|
| base::AutoLock locker(lock_);
|
| for (auto iter = endpoints_.begin(); iter != endpoints_.end();) {
|
| Endpoint* endpoint = iter->second.get();
|
|
|