Remove [Client=] annotation from ServiceProvider

examples/wm_flow/wm/wm.cc

Index: examples/wm_flow/wm/wm.cc
diff --git a/examples/wm_flow/wm/wm.cc b/examples/wm_flow/wm/wm.cc
index 67008bfe7ef0021652db3e29c6c4e0c9906950e3..c7dfc52e508760c388894a62a31bca4756993ab9 100644
--- a/examples/wm_flow/wm/wm.cc
+++ b/examples/wm_flow/wm/wm.cc
@@ -46,10 +46,9 @@ class SimpleWM : public mojo::ApplicationDelegate,
   }
 
   // Overridden from mojo::ViewManagerDelegate:
-  virtual void OnEmbed(
-      mojo::View* root,
-      mojo::ServiceProviderImpl* exported_services,
-      scoped_ptr<mojo::ServiceProvider> remote_service_provider) override {
+  virtual void OnEmbed(mojo::View* root,
+                       mojo::InterfaceRequest<mojo::ServiceProvider> services,
+                       mojo::ServiceProviderPtr exposed_services) override {
     root_ = root;
 
     window_container_ = root->view_manager()->CreateView();
@@ -66,13 +65,13 @@ class SimpleWM : public mojo::ApplicationDelegate,
   }
 
   // Overridden from mojo::WindowManagerDelegate:
-  virtual void Embed(
-      const mojo::String& url,
-      mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override {
+  virtual void Embed(const mojo::String& url,
+                     mojo::InterfaceRequest<mojo::ServiceProvider> services,
+                     mojo::ServiceProviderPtr exposed_services) override {
     DCHECK(root_);
     mojo::View* app_view = NULL;
     CreateTopLevelWindow(&app_view);
-    app_view->Embed(url, service_provider.Pass());
+    app_view->Embed(url, services.Pass(), exposed_services.Pass());
   }
 
   // Overridden from mojo::ViewObserver: