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

mojo/shell/service_connector.cc

 // Copyright 2013 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 "mojo/shell/service_connector.h"
 
 #include "base/logging.h"
+#include "mojo/public/bindings/error_handler.h"
 #include "mojo/public/bindings/remote_ptr.h"
 #include "mojom/shell.h"
 
 namespace mojo {
 namespace shell {
 
-class ServiceConnector::ServiceFactory : public Shell {
+class ServiceConnector::ServiceFactory : public Shell, public ErrorHandler {
  public:
   ServiceFactory(ServiceConnector* connector, const GURL& url)
       : connector_(connector),
         url_(url) {
     MessagePipe pipe;
-    shell_client_.reset(pipe.handle0.Pass(), this);
+    shell_client_.reset(pipe.handle0.Pass(), this, this);
     connector_->GetLoaderForURL(url)->Load(url, pipe.handle1.Pass());
   }
   virtual ~ServiceFactory() {}
 
   void ConnectToClient(ScopedMessagePipeHandle handle) {
     if (handle.is_valid())
       shell_client_->AcceptConnection(handle.Pass());
   }
 
   virtual void Connect(const String& url,
                        ScopedMessagePipeHandle client_pipe) MOJO_OVERRIDE {
     connector_->Connect(GURL(url.To<std::string>()), client_pipe.Pass());
   }
 
+  virtual void OnError() MOJO_OVERRIDE {
+    connector_->RemoveServiceFactory(this);
+  }
+
+  GURL url() const { return url_; }
+
  private:
   ServiceConnector* connector_;
   GURL url_;
   RemotePtr<ShellClient> shell_client_;
   DISALLOW_COPY_AND_ASSIGN(ServiceFactory);
 };
 
 ServiceConnector::Loader::Loader() {}
 ServiceConnector::Loader::~Loader() {}
 
+bool ServiceConnector::TestAPI::HasFactoryForURL(const GURL& url) const {
+  return connector_->url_to_service_factory_.find(url) !=
+      connector_->url_to_service_factory_.end();
+}
+
 ServiceConnector::ServiceConnector() : default_loader_(NULL) {
 }
 
 ServiceConnector::~ServiceConnector() {
   for (ServiceFactoryMap::iterator it = url_to_service_factory_.begin();
        it != url_to_service_factory_.end(); ++it) {
     delete it->second;
   }
   url_to_service_factory_.clear();
 }
@@ skipping 18 matching lines @@
   ServiceFactory* service_factory;
   if (service_it != url_to_service_factory_.end()) {
     service_factory = service_it->second;
   } else {
     service_factory = new ServiceFactory(this, url);
     url_to_service_factory_[url] = service_factory;
   }
   service_factory->ConnectToClient(client_handle.Pass());
 }
 
+void ServiceConnector::RemoveServiceFactory(ServiceFactory* service_factory) {
+  ServiceFactoryMap::iterator it =
+      url_to_service_factory_.find(service_factory->url());
+  DCHECK(it != url_to_service_factory_.end());
+  delete it->second;
+  url_to_service_factory_.erase(it);
+}
+
 }  // namespace shell
 }  // namespace mojo