Pass ServiceProvider and ServiceProvider& params in Connect

shell/context.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "shell/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 87 matching lines @@
       LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
                  << ": '" << parts[i + 1] << "' is not a valid URL.";
       return;
     }
     // TODO(eseidel): We should also validate that the mimetype is valid
     // net/base/mime_util.h could do this, but we don't want to depend on net.
     loader->RegisterContentHandler(parts[i], url);
   }
 }
 
-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;
   if (!base::SplitStringIntoKeyValuePairs(mappings, '=', ',', &pairs))
     return false;
   using StringPair = std::pair<std::string, std::string>;
   for (const StringPair& pair : pairs) {
     const GURL from(pair.first);
     const GURL to(pair.second);
     if (!from.is_valid() || !to.is_valid())
@@ skipping 81 matching lines @@
     if (app_urls_.empty() && base::MessageLoop::current()->is_running())
       base::MessageLoop::current()->Quit();
   }
 }
 
 GURL Context::ResolveURL(const GURL& url) {
   return mojo_url_resolver_.Resolve(url);
 }
 
 void Context::Run(const GURL& url) {
-  EmptyServiceProvider* sp = new EmptyServiceProvider;
-  ServiceProviderPtr spp;
-  BindToProxy(sp, &spp);
+  ServiceProviderPtr services;
+  ServiceProviderPtr exposed_services;
 
   app_urls_.insert(url);
-  application_manager_.ConnectToApplication(url, GURL(), spp.Pass());
+  application_manager_.ConnectToApplication(url, GURL(), GetProxy(&services),
+                                            exposed_services.Pass());
 }
 
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(application_url,
                                                      service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo