Remove [Client=] annotation from ServiceProvider

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 63 matching lines @@
 }  // namespace
 
 static int s_next_debugger_id = 1;
 
 DocumentView::DocumentView(
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exported_services,
     mojo::URLResponsePtr response,
     mojo::Shell* shell)
     : response_(response.Pass()),
+      exported_services_(services.Pass()),
       shell_(shell),
       web_view_(nullptr),
       root_(nullptr),
       view_manager_client_factory_(shell_, this),
       inspector_service_factory_(this),
       bitmap_rasterizer_(nullptr),
       debugger_id_(s_next_debugger_id++),
       weak_factory_(this) {
-  // TODO(jamesr): Is this right?
   exported_services_.AddService(&view_manager_client_factory_);
-  mojo::WeakBindToPipe(&exported_services_, services.PassMessagePipe());
+  inspector_service_provider_impl_.AddService(&inspector_service_factory_);
 }
 
 DocumentView::~DocumentView() {
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
 
 base::WeakPtr<DocumentView> DocumentView::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 void DocumentView::OnEmbed(
     mojo::View* root,
-    mojo::ServiceProviderImpl* exported_services,
-    scoped_ptr<mojo::ServiceProvider> imported_services) {
+    mojo::InterfaceRequest<mojo::ServiceProvider> services,
+    mojo::ServiceProviderPtr exposed_services) {
   root_ = root;
-  imported_services_ = imported_services.Pass();
+  imported_services_ = exposed_services.Pass();
   navigator_host_.set_service_provider(imported_services_.get());
-  exported_services->AddService(&inspector_service_factory_);
+
+  if (services.is_pending())
+    inspector_service_provider_impl_.Bind(services.Pass());
 
   Load(response_.Pass());
 
   auto& bounds = root_->bounds();
   float device_pixel_ratio = GetDevicePixelRatio();
   web_view_->resize(blink::WebSize(bounds.width / device_pixel_ratio,
                                    bounds.height / device_pixel_ratio));
 
   // TODO(abarth): We should ask the view whether it is focused instead of
   // assuming that we're focused.
@@ skipping 190 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