Rename ServiceConnector back to ServiceManager

mojo/shell/service_connector.cc

Index: mojo/shell/service_connector.cc
diff --git a/mojo/shell/service_connector.cc b/mojo/shell/service_connector.cc
deleted file mode 100644
index d136b4dca305b697b7dad0e971dc02b61ff58d83..0000000000000000000000000000000000000000
--- a/mojo/shell/service_connector.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-// 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/allocation_scope.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, public ErrorHandler {
- public:
-  ServiceFactory(ServiceConnector* connector, const GURL& url)
-      : connector_(connector),
-        url_(url) {
-    InterfacePipe<Shell> pipe;
-    shell_client_.reset(pipe.handle_to_peer.Pass(), this, this);
-    connector_->GetLoaderForURL(url)->Load(url, pipe.handle_to_self.Pass());
-  }
-  virtual ~ServiceFactory() {}
-
-  void ConnectToClient(ScopedMessagePipeHandle handle) {
-    if (handle.is_valid()) {
-      AllocationScope scope;
-      shell_client_->AcceptConnection(url_.spec(), 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);
-  }
-
-  const GURL& url() const { return url_; }
-
- private:
-  ServiceConnector* const connector_;
-  const 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();
-}
-
-void ServiceConnector::SetLoaderForURL(Loader* loader, const GURL& gurl) {
-  DCHECK(url_to_loader_.find(gurl) == url_to_loader_.end());
-  url_to_loader_[gurl] = loader;
-}
-
-ServiceConnector::Loader* ServiceConnector::GetLoaderForURL(const GURL& gurl) {
-  LoaderMap::const_iterator it = url_to_loader_.find(gurl);
-  if (it != url_to_loader_.end())
-    return it->second;
-  DCHECK(default_loader_);
-  return default_loader_;
-}
-
-void ServiceConnector::Connect(const GURL& url,
-                               ScopedMessagePipeHandle client_handle) {
-  ServiceFactoryMap::const_iterator service_it =
-      url_to_service_factory_.find(url);
-  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