Pass ServiceProvider and ServiceProvider& params in Connect

sky/viewer/internals.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 "sky/viewer/internals.h"
 
 #include "mojo/edk/js/core.h"
 #include "mojo/edk/js/handle.h"
 #include "mojo/edk/js/support.h"
 #include "mojo/edk/js/threading.h"
@@ skipping 82 matching lines @@
 // owns the handle and is expected to use it to create the JS Application for
 // the DocumentView.
 mojo::Handle Internals::PassShellProxyHandle() {
     mojo::MessagePipe pipe;
     if (!shell_binding_.is_bound())
       shell_binding_.Bind(pipe.handle0.Pass());
     return pipe.handle1.release();
 }
 
 void Internals::ConnectToApplication(
-    const mojo::String& application_url, 
-    mojo::InterfaceRequest<mojo::ServiceProvider> provider) {
-  if (document_view_) 
+    const mojo::String& application_url,
+    mojo::InterfaceRequest<mojo::ServiceProvider> services,
+    mojo::ServiceProviderPtr exported_services) {
+  if (document_view_) {
     document_view_->shell()->ConnectToApplication(
-        application_url, provider.Pass());
+        application_url, services.Pass(), exported_services.Pass());
+  }
 }
 
 mojo::Handle Internals::ConnectToService(
     const std::string& application_url, const std::string& interface_name) {
   if (!document_view_)
     return mojo::Handle();
 
   mojo::ServiceProviderPtr service_provider;
-  ConnectToApplication(application_url, mojo::GetProxy(&service_provider));
+  ConnectToApplication(application_url, mojo::GetProxy(&service_provider),
+                       mojo::ServiceProviderPtr());
 
   mojo::MessagePipe pipe;
   service_provider->ConnectToService(interface_name, pipe.handle1.Pass());
   return pipe.handle0.release();
 }
 
 void Internals::pauseAnimations(double pauseTime) {
   if (pauseTime < 0)
     return;
 
     document_view_->web_view()->mainFrame()->document().pauseAnimationsForTesting(pauseTime);
 }
 
 }  // namespace sky