Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

mojo/service_manager/service_manager.h

Index: mojo/service_manager/service_manager.h
diff --git a/mojo/service_manager/service_manager.h b/mojo/service_manager/service_manager.h
index 1e3fcbdce72ae6c08752750133a8fca196639cd7..682b2e9509f92288c1a9a74c31617eb76163169f 100644
--- a/mojo/service_manager/service_manager.h
+++ b/mojo/service_manager/service_manager.h
@@ -25,8 +25,8 @@ class MOJO_SERVICE_MANAGER_EXPORT ServiceManager {
     explicit TestAPI(ServiceManager* manager);
     ~TestAPI();
 
-    // Returns a handle to the shell.
-    ScopedShellHandle GetShellHandle();
+    // Returns a handle to a unique shell instance.
+    ScopedMessagePipeHandle GetShellHandle();
 
     // Returns true if the shared instance has been created.
     static bool HasCreatedInstance();
@@ -37,8 +37,7 @@ class MOJO_SERVICE_MANAGER_EXPORT ServiceManager {
     class TestShellConnection;
 
     ServiceManager* manager_;
-
-    scoped_ptr<TestShellConnection> shell_connection_;
+    ShellPtr shell_;
 
     DISALLOW_COPY_AND_ASSIGN(TestAPI);
   };
@@ -86,7 +85,7 @@ class MOJO_SERVICE_MANAGER_EXPORT ServiceManager {
   ServiceLoader* GetLoaderForURL(const GURL& url);
 
   // Removes a ServiceFactory when it no longer has any connections.
-  void OnServiceFactoryError(ServiceFactory* service_factory);
+  void RemoveServiceFactory(ServiceFactory* service_factory);
 
   // Loader management.
   URLToLoaderMap url_to_loader_;