Clean up dead InterfaceRegistry instances in ServiceContext

services/service_manager/public/cpp/interface_registry.h

 // 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_REGISTRY_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_REGISTRY_H_
 
+#include <list>
 #include <memory>
 #include <queue>
 #include <set>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/cpp/interface_provider_spec.h"
@@ skipping 125 matching lines @@
   // called.
   void PauseBinding();
 
   // Resumes incoming interface request binding.
   void ResumeBinding();
 
   // Populates a set with the interface names this registry can bind.
   void GetInterfaceNames(std::set<std::string>* interface_names);
 
   // Sets a closure to be run when the InterfaceProvider pipe is closed.
-  void SetConnectionLostClosure(const base::Closure& connection_lost_closure);
+  void AddConnectionLostClosure(const base::Closure& connection_lost_closure);
 
  private:
   using InterfaceNameToBinderMap =
       std::map<std::string, std::unique_ptr<InterfaceBinder>>;
 
   // mojom::InterfaceProvider:
   void GetInterface(const std::string& interface_name,
                     mojo::ScopedMessagePipeHandle handle) override;
 
   // Returns true if the binder was set, false if it was not set (e.g. by
   // some filtering policy preventing this interface from being exposed).
   bool SetInterfaceBinderForName(std::unique_ptr<InterfaceBinder> binder,
                                  const std::string& name);
 
   // Returns true if |remote_identity_| is allowed to bind |interface_name|,
   // according to capability policy.
   bool CanBindRequestForInterface(const std::string& interface_name) const;
 
   // Called whenever |remote_interface_provider_spec_| changes to rebuild the
   // contents of |exposed_interfaces_| and |expose_all_interfaces_|.
   void RebuildExposedInterfaces();
 
+  void OnConnectionError();
+
   mojom::InterfaceProviderRequest pending_request_;
 
   mojo::Binding<mojom::InterfaceProvider> binding_;
 
   std::string name_;
 
   // Initialized from static metadata in the host service's manifest.
   Identity local_identity_;
   InterfaceProviderSpec local_interface_provider_spec_;
 
@@ skipping 16 matching lines @@
   InterfaceNameToBinderMap name_to_binder_;
   Binder default_binder_;
 
   bool is_paused_ = false;
 
   // Pending interface requests which can accumulate if GetInterface() is called
   // while binding is paused.
   std::queue<std::pair<std::string, mojo::ScopedMessagePipeHandle>>
       pending_interface_requests_;
 
+  std::list<base::Closure> connection_lost_closures_;
+
   base::WeakPtrFactory<InterfaceRegistry> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfaceRegistry);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_REGISTRY_H_