Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/service_manager/service_manager.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 <stdio.h>
 
 #include "mojo/service_manager/service_manager.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/service_manager/service_loader.h"
 
 namespace mojo {
 
 namespace {
 // Used by TestAPI.
 bool has_created_instance = false;
 }
 
-class ServiceManager::ServiceFactory : public InterfaceImpl<ServiceProvider> {
+class ServiceManager::ServiceFactory : public InterfaceImpl<Shell> {
  public:
   ServiceFactory(ServiceManager* manager, const GURL& url)
       : manager_(manager),
         url_(url) {
   }
 
   virtual ~ServiceFactory() {
   }
 
   void ConnectToClient(ScopedMessagePipeHandle handle) {
     if (handle.is_valid()) {
       AllocationScope scope;
-      client()->ConnectToService(url_.spec(), handle.Pass());
+      client()->AcceptConnection(url_.spec(), handle.Pass());
     }
   }
 
-  // ServiceProvider implementation:
-  virtual void ConnectToService(const String& url,
-                                ScopedMessagePipeHandle client_pipe) OVERRIDE {
-    manager_->ConnectToService(GURL(url.To<std::string>()), client_pipe.Pass());
+  // Shell implementation:
+  virtual void Connect(const String& url,
+                       ScopedMessagePipeHandle client_pipe) OVERRIDE {
+    manager_->Connect(GURL(url.To<std::string>()), client_pipe.Pass());
   }
 
   const GURL& url() const { return url_; }
 
  private:
   virtual void OnConnectionError() OVERRIDE {
     manager_->OnServiceFactoryError(this);
   }
 
   ServiceManager* const manager_;
   const GURL url_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceFactory);
 };
 
-class ServiceManager::TestAPI::TestServiceProviderConnection
-    : public InterfaceImpl<ServiceProvider> {
+class ServiceManager::TestAPI::TestShellConnection
+    : public InterfaceImpl<Shell> {
  public:
-  explicit TestServiceProviderConnection(ServiceManager* manager)
-      : manager_(manager) {}
-  virtual ~TestServiceProviderConnection() {}
+  explicit TestShellConnection(ServiceManager* manager) : manager_(manager) {}
+  virtual ~TestShellConnection() {}
 
   virtual void OnConnectionError() OVERRIDE {
     // TODO(darin): How should we handle this error?
   }
 
-  // ServiceProvider:
-  virtual void ConnectToService(const String& url,
-                                ScopedMessagePipeHandle client_pipe) OVERRIDE {
-    manager_->ConnectToService(GURL(url.To<std::string>()), client_pipe.Pass());
+  // Shell:
+  virtual void Connect(const String& url,
+                       ScopedMessagePipeHandle client_pipe) OVERRIDE {
+    manager_->Connect(GURL(url.To<std::string>()), client_pipe.Pass());
   }
 
  private:
   ServiceManager* manager_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestServiceProviderConnection);
+  DISALLOW_COPY_AND_ASSIGN(TestShellConnection);
 };
 
 // static
 ServiceManager::TestAPI::TestAPI(ServiceManager* manager) : manager_(manager) {
 }
 
 ServiceManager::TestAPI::~TestAPI() {
 }
 
 bool ServiceManager::TestAPI::HasCreatedInstance() {
   return has_created_instance;
 }
 
-ScopedMessagePipeHandle ServiceManager::TestAPI::GetServiceProviderHandle() {
+ScopedMessagePipeHandle ServiceManager::TestAPI::GetShellHandle() {
   MessagePipe pipe;
-  service_provider_.reset(
-      BindToPipe(new TestServiceProviderConnection(manager_),
-                 pipe.handle0.Pass()));
+  shell_.reset(
+      BindToPipe(new TestShellConnection(manager_), pipe.handle0.Pass()));
   return pipe.handle1.Pass();
 }
 
 bool ServiceManager::TestAPI::HasFactoryForURL(const GURL& url) const {
   return manager_->url_to_service_factory_.find(url) !=
          manager_->url_to_service_factory_.end();
 }
 
 ServiceManager::ServiceManager()
     : interceptor_(NULL) {
 }
 
 ServiceManager::~ServiceManager() {
   STLDeleteValues(&url_to_service_factory_);
   STLDeleteValues(&url_to_loader_);
   STLDeleteValues(&scheme_to_loader_);
 }
 
 // static
 ServiceManager* ServiceManager::GetInstance() {
   static base::LazyInstance<ServiceManager> instance =
       LAZY_INSTANCE_INITIALIZER;
   has_created_instance = true;
   return &instance.Get();
 }
 
-void ServiceManager::ConnectToService(const GURL& url,
-                                      ScopedMessagePipeHandle client_handle) {
+void ServiceManager::Connect(const GURL& url,
+                             ScopedMessagePipeHandle client_handle) {
   URLToServiceFactoryMap::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 {
     MessagePipe pipe;
     GetLoaderForURL(url)->LoadService(this, url, pipe.handle0.Pass());
 
     service_factory =
@@ skipping 45 matching lines @@
   // Called from ~ServiceFactory, so we do not need to call Destroy here.
   const GURL url = service_factory->url();
   URLToServiceFactoryMap::iterator it = url_to_service_factory_.find(url);
   DCHECK(it != url_to_service_factory_.end());
   delete it->second;
   url_to_service_factory_.erase(it);
   GetLoaderForURL(url)->OnServiceError(this, url);
 }
 
 }  // namespace mojo