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 ae4112707ba62db8b717e319014081c59931bdcb..ce7493db502b2cbf214c7a5e5a702cd8576c9841 100644
--- a/mojo/service_manager/service_manager.h
+++ b/mojo/service_manager/service_manager.h
@@ -27,7 +27,7 @@ class MOJO_SERVICE_MANAGER_EXPORT ServiceManager {
     ~TestAPI();
 
     // Returns a handle to the shell.
-    ScopedShellHandle GetShellHandle();
+    ScopedMessagePipeHandle GetShellHandle();
 
     // Returns true if the shared instance has been created.
     static bool HasCreatedInstance();
@@ -87,7 +87,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_;