Remove [Client=] annotation from ServiceProvider

sky/tools/tester/tester.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 <iostream>
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
@@ skipping 65 matching lines @@
   }
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     window_manager_app_->ConfigureIncomingConnection(connection);
     if (test_runner_)
       connection->AddService(test_runner_->test_harness_factory());
     return true;
   }
 
   // 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;
     root_->AddObserver(this);
 
     content_ = root->view_manager()->CreateView();
     content_->SetBounds(root_->bounds());
     root_->AddChild(content_);
     content_->SetVisible(true);
 
     std::cout << "#READY\n";
     std::cout.flush();
     ScheduleRun();
   }
 
   // Overridden from window_manager::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 {}
 
   virtual void OnViewManagerDisconnected(
       mojo::ViewManager* view_manager) override {
     root_ = NULL;
   }
 
   virtual void OnViewDestroyed(mojo::View* view) override {
     view->RemoveObserver(this);
   }
 
@@ skipping 47 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SkyTester);
 };
 
 }  // namespace tester
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new sky::tester::SkyTester);
   return runner.Run(shell_handle);
 }