Changes view manager test to connect via shell

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"
@@ skipping 40 matching lines @@
   virtual void OnError() OVERRIDE {
     manager_->OnServiceFactoryError(this);
   }
 
   const GURL& url() const { return url_; }
 
  private:
   ServiceManager* const manager_;
   const GURL url_;
   RemotePtr<ShellClient> shell_client_;
+
   DISALLOW_COPY_AND_ASSIGN(ServiceFactory);
 };
 
+class ServiceManager::TestAPI::TestShellConnection
+    : public Shell,
+      public ErrorHandler {
+ public:
+  explicit TestShellConnection(ServiceManager* manager) : manager_(manager) {
+    InterfacePipe<Shell> pipe;
+    shell_client_.reset(pipe.handle_to_peer.Pass(), this, this);
+    shell_handle_ = pipe.handle_to_self.Pass();
+  }
+  virtual ~TestShellConnection() {}
+
+  ScopedShellHandle GetShellHandle() {
+    return shell_handle_.Pass();
+  }
+
+  // Shell:
+  virtual void Connect(const String& url,
+                       ScopedMessagePipeHandle client_pipe) OVERRIDE {
+    manager_->Connect(GURL(url.To<std::string>()), client_pipe.Pass());
+  }
+
+  virtual void OnError() OVERRIDE {
+  }
+
+ private:
+  ServiceManager* manager_;
+  RemotePtr<ShellClient> shell_client_;
+  ScopedShellHandle shell_handle_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestShellConnection);
+};
+
 // static
+ServiceManager::TestAPI::TestAPI(ServiceManager* manager) : manager_(manager) {
+}
+
+ServiceManager::TestAPI::~TestAPI() {
+}
+
 bool ServiceManager::TestAPI::HasCreatedInstance() {
   return has_created_instance;
 }
 
+ScopedShellHandle ServiceManager::TestAPI::GetShellHandle() {
+  if (!shell_connection_.get())
+    shell_connection_.reset(new TestShellConnection(manager_));
+  return shell_connection_->GetShellHandle().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() {
@@ skipping 64 matching lines @@
 void ServiceManager::OnServiceFactoryError(ServiceFactory* service_factory) {
   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