Handle early ServiceRequest errors in shell::ServiceContext

services/shell/public/cpp/lib/service_context.cc

Index: services/shell/public/cpp/lib/service_context.cc
diff --git a/services/shell/public/cpp/lib/service_context.cc b/services/shell/public/cpp/lib/service_context.cc
index 939faba4920899f3953d5bfbb0d41f9d4c1faf1c..6b7343bd717810e42745da6e5375191c4a09301d 100644
--- a/services/shell/public/cpp/lib/service_context.cc
+++ b/services/shell/public/cpp/lib/service_context.cc
@@ -28,6 +28,8 @@ ServiceContext::ServiceContext(shell::Service* service,
       binding_(this, std::move(request)),
       connector_(std::move(connector)) {
   DCHECK(binding_.is_bound());
+  binding_.set_connection_error_handler(
+      base::Bind(&ServiceContext::OnConnectionError, base::Unretained(this)));
   if (!connector_) {
     connector_ = Connector::Create(&pending_connector_request_);
   } else {
@@ -55,10 +57,6 @@ void ServiceContext::OnStart(const shell::Identity& identity,
 
   callback.Run(std::move(pending_connector_request_));
 
-  DCHECK(binding_.is_bound());
-  binding_.set_connection_error_handler(
-      base::Bind(&ServiceContext::OnConnectionError, base::Unretained(this)));
-
   service_->OnStart(identity_);
 }