Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(561)

Unified Diff: base/message_loop/message_loop.cc

Issue 1501343002: Prepare chrome to use the new Mojo EDK by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable turning on in this cl Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/app/mojo/mojo_init.cc » ('j') | content/test/run_all_unittests.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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";
+ }
}
}
« no previous file with comments | « no previous file | content/app/mojo/mojo_init.cc » ('j') | content/test/run_all_unittests.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698