Handle early ServiceRequest errors in shell::ServiceContext

content/common/mojo/mojo_shell_connection_impl.cc

Index: content/common/mojo/mojo_shell_connection_impl.cc
diff --git a/content/common/mojo/mojo_shell_connection_impl.cc b/content/common/mojo/mojo_shell_connection_impl.cc
index e66aef0d1c0111775b07874b01d1287a032c2fc9..0bd2ccad75e167ab5b7a8ef5dd70f6332f5a62d8 100644
--- a/content/common/mojo/mojo_shell_connection_impl.cc
+++ b/content/common/mojo/mojo_shell_connection_impl.cc
@@ -191,6 +191,10 @@ class MojoShellConnectionImpl::IOThreadContext
     factory_bindings_.CloseAllBindings();
     service_context_.reset();
 
+    ClearConnectionFiltersOnIOThread();
+  }
+
+  void ClearConnectionFiltersOnIOThread() {
     base::AutoLock lock(lock_);
     connection_filters_.clear();
   }
@@ -252,6 +256,7 @@ class MojoShellConnectionImpl::IOThreadContext
   }
 
   bool OnStop() override {
+    ClearConnectionFiltersOnIOThread();
     callback_task_runner_->PostTask(FROM_HERE, stop_callback_);
     return true;
   }