| Index: third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc
|
| index de8d17fddb236e00418464f985d020189dd68a0d..5ff8e56d85fe56a5f8252f64cf31655cd5f34f09 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc
|
| +++ b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc
|
| @@ -48,7 +48,6 @@ void SlaveConnectionManager::Init(
|
| DCHECK(!private_thread_.message_loop());
|
|
|
| delegate_thread_task_runner_ = delegate_thread_task_runner;
|
| - AssertOnDelegateThread();
|
| slave_process_delegate_ = slave_process_delegate;
|
| CHECK(private_thread_.StartWithOptions(
|
| base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
|
| @@ -60,7 +59,7 @@ void SlaveConnectionManager::Init(
|
| }
|
|
|
| void SlaveConnectionManager::Shutdown() {
|
| - AssertOnDelegateThread();
|
| + AssertNotOnPrivateThread();
|
| DCHECK(slave_process_delegate_);
|
| DCHECK(private_thread_.message_loop());
|
|
|
| @@ -294,12 +293,6 @@ void SlaveConnectionManager::OnError(Error error) {
|
| base::Unretained(slave_process_delegate_)));
|
| }
|
|
|
| -void SlaveConnectionManager::AssertOnDelegateThread() const {
|
| - DCHECK(base::MessageLoop::current());
|
| - DCHECK_EQ(base::MessageLoop::current()->task_runner(),
|
| - delegate_thread_task_runner_);
|
| -}
|
| -
|
| void SlaveConnectionManager::AssertNotOnPrivateThread() const {
|
| // This should only be called after |Init()| and before |Shutdown()|. (If not,
|
| // the subsequent |DCHECK_NE()| is invalid, since the current thread may not
|
|
|