Pass ServiceProvider and ServiceProvider& params in Connect

sky/viewer/document_view.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/document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 54 matching lines @@
     default:
       return mojo::TARGET_DEFAULT;
   }
 }
 
 }  // namespace
 
 static int s_next_debugger_id = 1;
 
 DocumentView::DocumentView(
-    mojo::ServiceProviderPtr provider,
+    mojo::InterfaceRequest<mojo::ServiceProvider> services,
+    mojo::ServiceProviderPtr exported_services,
     mojo::URLResponsePtr response,
     mojo::Shell* shell)
     : response_(response.Pass()),
       shell_(shell),
       web_view_(NULL),
       root_(NULL),
       view_manager_client_factory_(shell_, this),
       inspector_service_factory_(this),
       weak_factory_(this),
       debugger_id_(s_next_debugger_id++) {
+  // TODO(jamesr): Is this right?
   exported_services_.AddService(&view_manager_client_factory_);
-  mojo::WeakBindToPipe(&exported_services_, provider.PassMessagePipe());
+  mojo::WeakBindToPipe(&exported_services_, services.PassMessagePipe());
 }
 
 DocumentView::~DocumentView() {
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
 
 base::WeakPtr<DocumentView> DocumentView::GetWeakPtr() {
@@ skipping 179 matching lines @@
 void DocumentView::StartDebuggerInspectorBackend() {
   if (!inspector_backend_) {
     inspector_host_.reset(new InspectorHostImpl(web_view_, shell_));
     inspector_backend_.reset(
         new inspector::InspectorBackendMojo(inspector_host_.get()));
   }
   inspector_backend_->Connect();
 }
 
 }  // namespace sky