Pass ServiceProvider and ServiceProvider& params in Connect

mojo/application_manager/application_manager.h

Index: mojo/application_manager/application_manager.h
diff --git a/mojo/application_manager/application_manager.h b/mojo/application_manager/application_manager.h
index f98f17a4a31c534dbbe4877f31a5e49f7fb9a96e..75a3d06b2f4fa0e8146b1b264c54cebeae608c94 100644
--- a/mojo/application_manager/application_manager.h
+++ b/mojo/application_manager/application_manager.h
@@ -48,13 +48,14 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
     DISALLOW_COPY_AND_ASSIGN(TestAPI);
   };
 
-  ApplicationManager(Delegate* delegate);
+  explicit ApplicationManager(Delegate* delegate);
   ~ApplicationManager();
 
   // Loads a service if necessary and establishes a new client connection.
   void ConnectToApplication(const GURL& application_url,
                             const GURL& requestor_url,
-                            ServiceProviderPtr service_provider);
+                            InterfaceRequest<ServiceProvider> services,
+                            ServiceProviderPtr exposed_services);
 
   template <typename Interface>
   inline void ConnectToService(const GURL& application_url,
@@ -110,13 +111,15 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
   void ConnectToApplicationImpl(const GURL& requested_url,
                                 const GURL& resolved_url,
                                 const GURL& requestor_url,
-                                ServiceProviderPtr service_provider,
+                                InterfaceRequest<ServiceProvider> services,
+                                ServiceProviderPtr exposed_services,
                                 ApplicationLoader* loader);
 
   void ConnectToClient(ShellImpl* shell_impl,
                        const GURL& url,
                        const GURL& requestor_url,
-                       ServiceProviderPtr service_provider);
+                       InterfaceRequest<ServiceProvider> services,
+                       ServiceProviderPtr exposed_services);
 
   void LoadWithContentHandler(const GURL& content_handler_url,
                               ScopedMessagePipeHandle shell_handle,