Pass ServiceProvider and ServiceProvider& params in Connect

examples/content_handler_demo/content_handler_demo.cc

 // Copyright 2014 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 <stdio.h>
 
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_runner.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace examples {
 
 class PrintBodyApplication : public InterfaceImpl<Application> {
  public:
   PrintBodyApplication(ShellPtr shell, ScopedDataPipeConsumerHandle body)
       : shell_(shell.Pass()), body_(body.Pass()) {
     shell_.set_client(this);
   }
 
   virtual void Initialize(Array<String> args) override {}
 
   virtual void AcceptConnection(const String& requestor_url,
-                                ServiceProviderPtr service_provider) override {
+                                InterfaceRequest<ServiceProvider> services,
+                                ServiceProviderPtr exported_services) override {
     printf("ContentHandler::OnConnect - requestor_url:%s - body follows\n\n",
            requestor_url.To<std::string>().c_str());
     PrintResponse(body_.Pass());
     delete this;
   }
 
  private:
   void PrintResponse(ScopedDataPipeConsumerHandle body) const {
     for (;;) {
       char buf[512];
@@ skipping 55 matching lines @@
   MOJO_DISALLOW_COPY_AND_ASSIGN(ContentHandlerApp);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new mojo::examples::ContentHandlerApp);
   return runner.Run(shell_handle);
 }