Remove [Client=] annotation from ServiceProvider

services/window_manager/window_manager_impl.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 "services/window_manager/window_manager_impl.h"
 
 #include "mojo/services/view_manager/public/cpp/view.h"
 #include "services/window_manager/focus_controller.h"
 #include "services/window_manager/window_manager_app.h"
 
@@ skipping 31 matching lines @@
 }
 
 void WindowManagerImpl::NotifyCaptureChanged(Id new_capture_id,
                                              Id old_capture_id) {
   if (from_vm_)
     client()->OnCaptureChanged(old_capture_id, new_capture_id);
 }
 
 void WindowManagerImpl::Embed(
     const mojo::String& url,
-    mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) {
-  window_manager_->Embed(url, service_provider.Pass());
+    mojo::InterfaceRequest<mojo::ServiceProvider> services,
+    mojo::ServiceProviderPtr exposed_services) {
+  window_manager_->Embed(url, services.Pass(), exposed_services.Pass());
 }
 
 void WindowManagerImpl::SetCapture(Id view,
                                    const Callback<void(bool)>& callback) {
   if (!from_vm_)
     return;  // See comments for |from_vm_| on this.
 
   bool success = window_manager_->IsReady();
   if (success)
     window_manager_->SetCapture(view);
@@ skipping 36 matching lines @@
   // TODO(sky): sanitize ids for client.
   callback.Run(focused_view ? focused_view->id() : 0,
                active_view ? active_view->id() : 0);
 }
 
 void WindowManagerImpl::OnConnectionError() {
   delete this;
 }
 
 }  // namespace window_manager