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

Unified Diff: mojo/message_pump/handle_watcher.cc

Issue 1423723007: Revert of Enable multiprocess by default on desktop mojo_runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | mojo/runner/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/message_pump/handle_watcher.cc
diff --git a/mojo/message_pump/handle_watcher.cc b/mojo/message_pump/handle_watcher.cc
index 7dec3f39bd3f65237c52085be1c09cf607f767f0..964f1e2d3348d80b1edef376538ce2eac0862639 100644
--- a/mojo/message_pump/handle_watcher.cc
+++ b/mojo/message_pump/handle_watcher.cc
@@ -222,13 +222,7 @@
}
WatcherThreadManager* WatcherThreadManager::GetInstance() {
- // We need to leak this because otherwise when the process dies, AtExitManager
- // waits for destruction which waits till the handle watcher thread is joined.
- // But that can't happen since the pump uses mojo message pipes to wake up the
- // pump. Since mojo EDK has been shutdown already, this never completes.
- return base::Singleton<WatcherThreadManager,
- base::LeakySingletonTraits<WatcherThreadManager>>::
- get();
+ return base::Singleton<WatcherThreadManager>::get();
}
WatcherID WatcherThreadManager::StartWatching(
« no previous file with comments | « no previous file | mojo/runner/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698