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

Unified Diff: content/browser/browser_main_loop.cc

Issue 1877153003: mash: Fix crashes during chrome teardown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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 | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 65e88aced2e3117ad82bb6682e2fccfdfa859280..41ca90311171e899402f245463865e9eb61b0344 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -969,9 +969,6 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed),
true));
- if (IsRunningInMojoShell())
- MojoShellConnection::Destroy();
-
if (RenderProcessHost::run_renderer_in_process())
RenderProcessHostImpl::ShutDownInProcessRenderer();
@@ -981,6 +978,9 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
parts_->PostMainMessageLoopRun();
}
+ if (IsRunningInMojoShell())
+ MojoShellConnection::Destroy();
+
#if defined(USE_AURA)
env_.reset();
#endif
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698