Cleanup Service<> and ServiceFactory<> when clients go away.

mojo/shell/service_connector.h

Index: mojo/shell/service_connector.h
diff --git a/mojo/shell/service_connector.h b/mojo/shell/service_connector.h
index 725b11921797f3f50f21fbd1ff39be4ed0be6afd..5e51069b80b7d9a91be69ab91f28fb58f00cd0b0 100644
--- a/mojo/shell/service_connector.h
+++ b/mojo/shell/service_connector.h
@@ -41,10 +41,15 @@ class ServiceConnector {
   Loader* GetLoaderForURL(const GURL& gurl);
   // Loads a service if necessary and establishes a new client connection.
   void Connect(const GURL& url, ScopedMessagePipeHandle client_handle);
+  // Returns true if there is a ServiceFactory for this URL.
+  bool HasFactoryForURL(const GURL& url) const;

[darin (slow to review), 2014/02/06 05:00:46]

nit: the service factory is a private implementation detail. it seems strange to
expose it here. maybe HasConnectionForURL or HasActiveService would be a better
name?

EDIT: but I see you are doing so for testing purposes. Maybe use a name like
HasServiceFactoryForTesting?

 
  private:
   class ServiceFactory;
 
+  // Removes a ServiceFactory when it no longer has any connections.
+  void RemoveServiceFactory(ServiceFactory* service_factory);
+
   Loader* default_loader_;
   typedef std::map<GURL, ServiceFactory*> ServiceFactoryMap;
   ServiceFactoryMap url_to_service_factory_;