Changes view manager test to connect via shell

mojo/service_manager/service_manager.h

 // 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.
 
 #ifndef MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_
 #define MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/service_manager/service_manager_export.h"
 #include "url/gurl.h"
 
-namespace content {
-  class MojoTest;
-}
-
 namespace mojo {
 
 class MOJO_SERVICE_MANAGER_EXPORT ServiceManager {
  public:
   // API for testing.
   class MOJO_SERVICE_MANAGER_EXPORT TestAPI {
-   private:
-    friend class ServiceManagerTest;
-    friend class content::MojoTest;
+   public:
+    explicit TestAPI(ServiceManager* manager);
+    ~TestAPI();
 
-    explicit TestAPI(ServiceManager* manager) : manager_(manager) {}
+    // Returns a handle to the shell.
+    ScopedShellHandle GetShellHandle();
+
     // Returns true if the shared instance has been created.
     static bool HasCreatedInstance();
     // Returns true if there is a ServiceFactory for this URL.
     bool HasFactoryForURL(const GURL& url) const;
 
+   private:
+    class TestShellConnection;
+
     ServiceManager* manager_;
+
+    scoped_ptr<TestShellConnection> shell_connection_;
+
+    DISALLOW_COPY_AND_ASSIGN(TestAPI);
   };
 
   // Interface class for debugging only.
   class Interceptor {
    public:
     virtual ~Interceptor() {}
     // Called when ServiceManager::Connect is called.
     virtual ScopedMessagePipeHandle OnConnectToClient(
         const GURL& url, ScopedMessagePipeHandle handle) = 0;
   };
@@ skipping 40 matching lines @@
   scoped_ptr<ServiceLoader> default_loader_;
   Interceptor* interceptor_;
 
   URLToServiceFactoryMap url_to_service_factory_;
   DISALLOW_COPY_AND_ASSIGN(ServiceManager);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_