Pass ServiceProvider and ServiceProvider& params in Connect

mojo/application_manager/shell_impl.h

Index: mojo/application_manager/shell_impl.h
diff --git a/mojo/application_manager/shell_impl.h b/mojo/application_manager/shell_impl.h
index ff35548e803e870ef74b9be01719f7103e38680d..58e30666e9eff13e3fcba64f77c28915b6d88b2b 100644
--- a/mojo/application_manager/shell_impl.h
+++ b/mojo/application_manager/shell_impl.h
@@ -29,7 +29,8 @@ class ShellImpl : public Shell, public ErrorHandler {
   ~ShellImpl() override;
 
   void ConnectToClient(const GURL& requestor_url,
-                       ServiceProviderPtr service_provider);
+                       InterfaceRequest<ServiceProvider> services,
+                       ServiceProviderPtr exposed_services);
 
   Application* client() { return binding_.client(); }
   const GURL& url() const { return url_; }
@@ -41,9 +42,9 @@ class ShellImpl : public Shell, public ErrorHandler {
             const GURL& url);
 
   // Shell implementation:
-  void ConnectToApplication(
-      const String& app_url,
-      InterfaceRequest<ServiceProvider> in_service_provider) override;
+  void ConnectToApplication(const String& app_url,
+                            InterfaceRequest<ServiceProvider> services,
+                            ServiceProviderPtr exposed_services) override;
 
   // ErrorHandler implementation:
   void OnConnectionError() override;