| Index: mojo/edk/system/slave_connection_manager.cc
|
| diff --git a/mojo/edk/system/slave_connection_manager.cc b/mojo/edk/system/slave_connection_manager.cc
|
| index 2f842f4d9e377e22664e18e424f92bb8524f80fa..c147dca8be1904223b9b16f1e82ec0ffec0e8f9d 100644
|
| --- a/mojo/edk/system/slave_connection_manager.cc
|
| +++ b/mojo/edk/system/slave_connection_manager.cc
|
| @@ -327,9 +327,12 @@ void SlaveConnectionManager::OnError(Error error) {
|
| raw_channel_.reset();
|
|
|
| DCHECK(slave_process_delegate_);
|
| - delegate_thread_task_runner_->PostTask(
|
| - base::Bind(&embedder::SlaveProcessDelegate::OnMasterDisconnect,
|
| - base::Unretained(slave_process_delegate_)));
|
| + // TODO(vtl): With C++14 lambda captures, we'll be able to avoid this
|
| + // nonsense.
|
| + auto slave_process_delegate = slave_process_delegate_;
|
| + delegate_thread_task_runner_->PostTask([slave_process_delegate]() {
|
| + slave_process_delegate->OnMasterDisconnect();
|
| + });
|
| }
|
|
|
| void SlaveConnectionManager::AssertNotOnPrivateThread() const {
|
|
|