| Index: base/message_loop/message_loop.cc
|
| diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc
|
| index a0c5f61f598dec8f78ed9645e8fef5171ab6b85c..b5e9c6599403033d144407e7fc05d1208fd97065 100644
|
| --- a/base/message_loop/message_loop.cc
|
| +++ b/base/message_loop/message_loop.cc
|
| @@ -300,7 +300,12 @@ void MessageLoop::QuitWhenIdle() {
|
| if (run_loop_) {
|
| run_loop_->quit_when_idle_received_ = true;
|
| } else {
|
| - NOTREACHED() << "Must be inside Run to call Quit";
|
| + // We don't assert that run_loop_ is valid for custom message pumps. Some,
|
| + // for example MojoMessagePump, might have shutdown already based on other
|
| + // shutdown signals.
|
| + if (type_ != MessageLoop::TYPE_CUSTOM) {
|
| + NOTREACHED() << "Must be inside Run to call Quit";
|
| + }
|
| }
|
| }
|
|
|
|
|