Remove [Client=] annotation from ServiceProvider

services/window_manager/main.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 "base/memory/scoped_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
@@ skipping 27 matching lines @@
     window_manager_app_->Initialize(impl);
   }
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     window_manager_app_->ConfigureIncomingConnection(connection);
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   void OnEmbed(View* root,
-               mojo::ServiceProviderImpl* exported_services,
-               scoped_ptr<mojo::ServiceProvider> imported_services) override {
+               mojo::InterfaceRequest<mojo::ServiceProvider> services,
+               mojo::ServiceProviderPtr exposed_services) override {
     root_ = root;
   }
   void OnViewManagerDisconnected(ViewManager* view_manager) override {}
 
   // Overridden from WindowManagerDelegate:
-  void Embed(
-      const mojo::String& url,
-      mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override {
+  void Embed(const mojo::String& url,
+             mojo::InterfaceRequest<mojo::ServiceProvider> services,
+             mojo::ServiceProviderPtr exposed_services) override {
     DCHECK(root_);
     View* view = root_->view_manager()->CreateView();
     root_->AddChild(view);
 
     mojo::Rect rect;
     rect.x = rect.y = window_offset_;
     rect.width = rect.height = 100;
     view->SetBounds(rect);
     window_offset_ += 10;
 
     view->SetVisible(true);
-    view->Embed(url, service_provider.Pass());
+    view->Embed(url, services.Pass(), exposed_services.Pass());
   }
 
   scoped_ptr<WindowManagerApp> window_manager_app_;
 
   View* root_;
   int window_offset_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager);
 };
 
 }  // namespace window_manager
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(
       new window_manager::DefaultWindowManager);
   return runner.Run(shell_handle);
 }