Pass ServiceProvider and ServiceProvider& params in Connect

shell/context.cc

Index: shell/context.cc
diff --git a/shell/context.cc b/shell/context.cc
index 882b358021d33fa857c32b6c170fb07ca6f25206..10d2401048151c9a48f36c83e450b288e74af795 100644
--- a/shell/context.cc
+++ b/shell/context.cc
@@ -89,12 +89,6 @@ void InitContentHandlers(DynamicApplicationLoader* loader,
   }
 }
 
-class EmptyServiceProvider : public InterfaceImpl<ServiceProvider> {
- private:
-  void ConnectToService(const mojo::String& service_name,
-                        ScopedMessagePipeHandle client_handle) override {}
-};
-
 bool ConfigureURLMappings(const std::string& mappings,
                           mojo::shell::MojoURLResolver* resolver) {
   base::StringPairs pairs;
@@ -196,12 +190,12 @@ GURL Context::ResolveURL(const GURL& url) {
 }
 
 void Context::Run(const GURL& url) {
-  EmptyServiceProvider* sp = new EmptyServiceProvider;
-  ServiceProviderPtr spp;
-  BindToProxy(sp, &spp);
+  ServiceProviderPtr services;
+  ServiceProviderPtr exported_services;
 
   app_urls_.insert(url);
-  application_manager_.ConnectToApplication(url, GURL(), spp.Pass());
+  application_manager_.ConnectToApplication(url, GURL(), GetProxy(&services),
+                                            exported_services.Pass());
 }
 
 ScopedMessagePipeHandle Context::ConnectToServiceByName(