Add connection error handing in ServiceRegistryImpl.

content/common/mojo/service_registry_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/mojo/service_registry_impl.h"
 
 #include "mojo/common/common_type_converters.h"
 
 namespace content {
 
 ServiceRegistryImpl::ServiceRegistryImpl()
     : binding_(this), weak_factory_(this) {
 }
 
 ServiceRegistryImpl::~ServiceRegistryImpl() {
   while (!pending_connects_.empty()) {
     mojo::CloseRaw(pending_connects_.front().second);
     pending_connects_.pop();
   }
 }
 
 void ServiceRegistryImpl::Bind(
     mojo::InterfaceRequest<mojo::ServiceProvider> request) {
+  binding_.set_error_handler(this);

[Ken Rockot(use gerrit already), 2015/05/05 17:59:23]

nit: might as well just do this in the ctor

[xhwang, 2015/05/05 18:09:26]

Done.

   binding_.Bind(request.Pass());
 }
 
 void ServiceRegistryImpl::BindRemoteServiceProvider(
     mojo::ServiceProviderPtr service_provider) {
   CHECK(!remote_provider_);
   remote_provider_ = service_provider.Pass();
   while (!pending_connects_.empty()) {
     remote_provider_->ConnectToService(
         mojo::String::From(pending_connects_.front().first),
@@ skipping 17 matching lines @@
     mojo::ScopedMessagePipeHandle handle) {
   if (!remote_provider_) {
     pending_connects_.push(
         std::make_pair(service_name.as_string(), handle.release()));
     return;
   }
   remote_provider_->ConnectToService(mojo::String::From(service_name),
                                      handle.Pass());
 }
 
+bool ServiceRegistryImpl::IsBound() const {
+  return binding_.is_bound();
+}
+
 base::WeakPtr<ServiceRegistry> ServiceRegistryImpl::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 void ServiceRegistryImpl::ConnectToService(
     const mojo::String& name,
     mojo::ScopedMessagePipeHandle client_handle) {
   std::map<std::string,
            base::Callback<void(mojo::ScopedMessagePipeHandle)> >::iterator it =
       service_factories_.find(name);
   if (it == service_factories_.end())
     return;
 
   it->second.Run(client_handle.Pass());
 }
 
+void ServiceRegistryImpl::OnConnectionError() {
+  binding_.Close();
+}
+
 }  // namespace content