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

Unified Diff: services/shell/shell.cc

Issue 2112543002: Convert UtilityProcessHost to bootstrap Mojo Channel using the Shell connection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@p9x
Patch Set: . Created 4 years, 6 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 | « extensions/browser/sandboxed_unpacker_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/shell.cc
diff --git a/services/shell/shell.cc b/services/shell/shell.cc
index 79763bfa0b3459a65d2015fd0aeed1c2e865ef2a..76f41cb75bb30dffeba7702e87a52b8c8b56d7b6 100644
--- a/services/shell/shell.cc
+++ b/services/shell/shell.cc
@@ -579,8 +579,10 @@ mojom::ShellResolver* Shell::GetResolver(const Identity& identity) {
void Shell::TerminateShellConnections() {
Instance* instance = GetExistingInstance(CreateShellIdentity());
- DCHECK(instance);
- OnInstanceError(instance);
+ // The Shell instance may have been destructed as a result of the client
+ // closing its connector.
+ if (instance)
+ OnInstanceError(instance);
}
void Shell::OnInstanceError(Instance* instance) {
« no previous file with comments | « extensions/browser/sandboxed_unpacker_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698