Clean up dead InterfaceRegistry instances in ServiceContext

services/service_manager/public/cpp/service_context.h

 // 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
 
+#include <map>
 #include <memory>
-#include <utility>
-#include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/system/core.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/interfaces/connector.mojom.h"
 #include "services/service_manager/public/interfaces/service.mojom.h"
 
 namespace service_manager {
 
 // Encapsulates a connection to the Service Manager in two parts:
@@ skipping 34 matching lines @@
   Connector* connector() { return connector_.get(); }
   const Identity& identity() { return local_info_.identity; }
 
   // Specify a function to be called when the connection to the service manager
   // is lost.
   // Note that if connection has already been lost, then |closure| is called
   // immediately.
   void SetConnectionLostClosure(const base::Closure& closure);
 
  private:
+  using InterfaceRegistryMap =
+      std::map<InterfaceRegistry*, std::unique_ptr<InterfaceRegistry>>;
+
   // mojom::Service:
   void OnStart(const ServiceInfo& info,
                const OnStartCallback& callback) override;
   void OnConnect(const ServiceInfo& source_info,
                  mojom::InterfaceProviderRequest interfaces) override;
 
   void OnConnectionError();
+  void OnRegistryConnectionError(InterfaceRegistry* registry);
+  void DestroyConnectionInterfaceRegistry(InterfaceRegistry* registry);
 
   // A callback called when OnStart() is run.
   base::Closure initialize_handler_;
 
-  // We track the lifetime of incoming connection registries as it more
-  // convenient for the client.
-  std::vector<std::unique_ptr<InterfaceRegistry>> incoming_connections_;
+  // We track the lifetime of incoming connection registries as a convenience
+  // for the client.
+  InterfaceRegistryMap connection_interface_registries_;
 
   // A pending Connector request which will eventually be passed to the Service
   // Manager.
   mojom::ConnectorRequest pending_connector_request_;
 
   service_manager::Service* service_;
   mojo::Binding<mojom::Service> binding_;
   std::unique_ptr<Connector> connector_;
   service_manager::ServiceInfo local_info_;
   bool should_run_connection_lost_closure_ = false;
 
   base::Closure connection_lost_closure_;
 
+  base::WeakPtrFactory<ServiceContext> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ServiceContext);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_