Clean up dead InterfaceRegistry instances in ServiceContext

services/service_manager/public/cpp/lib/interface_registry.cc

 // Copyright 2016 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 "services/service_manager/public/cpp/interface_registry.h"
 
 #include <sstream>
 
 #include "mojo/public/cpp/bindings/message.h"
 #include "services/service_manager/public/cpp/connection.h"
@@ skipping 81 matching lines @@
     const InterfaceProviderSpec& local_interface_provider_spec,
     const Identity& remote_identity,
     const InterfaceProviderSpec& remote_interface_provider_spec) {
   DCHECK(!binding_.is_bound());
   local_identity_ = local_identity;
   local_interface_provider_spec_ = local_interface_provider_spec;
   remote_identity_ = remote_identity;
   remote_interface_provider_spec_ = remote_interface_provider_spec;
   RebuildExposedInterfaces();
   binding_.Bind(std::move(local_interfaces_request));
+  binding_.set_connection_error_handler(base::Bind(
+      &InterfaceRegistry::OnConnectionError, base::Unretained(this)));
 }
 
 void InterfaceRegistry::Serialize(std::stringstream* stream) {
   *stream << "\n\nInterfaceRegistry(" << name_ << "):\n";
   if (!binding_.is_bound()) {
     *stream << "\n  --> InterfaceRegistry is not yet bound to a pipe.\n\n";
     return;
   }
 
   *stream << "Owned by:\n  ";
@@ skipping 58 matching lines @@
   }
 }
 
 void InterfaceRegistry::GetInterfaceNames(
     std::set<std::string>* interface_names) {
   DCHECK(interface_names);
   for (auto& entry : name_to_binder_)
     interface_names->insert(entry.first);
 }
 
-void InterfaceRegistry::SetConnectionLostClosure(
+void InterfaceRegistry::AddConnectionLostClosure(
     const base::Closure& connection_lost_closure) {
-  binding_.set_connection_error_handler(connection_lost_closure);
+  connection_lost_closures_.push_back(connection_lost_closure);
 }
 
 // mojom::InterfaceProvider:
 void InterfaceRegistry::GetInterface(const std::string& interface_name,
                                      mojo::ScopedMessagePipeHandle handle) {
   if (is_paused_) {
     pending_interface_requests_.emplace(interface_name, std::move(handle));
     return;
   }
 
@@ skipping 47 matching lines @@
 }
 
 void InterfaceRegistry::RebuildExposedInterfaces() {
   exposed_interfaces_ = GetInterfacesToExpose(remote_interface_provider_spec_,
                                               local_identity_,
                                               local_interface_provider_spec_);
   expose_all_interfaces_ =
       exposed_interfaces_.size() == 1 && exposed_interfaces_.count("*") == 1;
 }
 
+void InterfaceRegistry::OnConnectionError() {
+  for (const auto& closure : connection_lost_closures_)
+    closure.Run();
+}
+
 }  // namespace service_manager