Remove [Client=] annotation from ServiceProvider

sky/tools/tester/test_runner.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/tools/tester/test_runner.h"
 
 #include <iostream>
 #include "base/bind.h"
 #include "mojo/public/cpp/application/connect.h"
-#include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 
 namespace sky {
 namespace tester {
 
 TestRunnerClient::~TestRunnerClient() {
 }
 
 TestRunner::TestRunner(TestRunnerClient* client, mojo::View* container,
     const std::string& url, bool enable_pixel_dumping)
     : test_harness_factory_(this),
       client_(client),
       weak_ptr_factory_(this),
       enable_pixel_dumping_(enable_pixel_dumping) {
   CHECK(client);
 
-  scoped_ptr<mojo::ServiceProviderImpl> exported_services(
-    new mojo::ServiceProviderImpl());
-  exported_services->AddService(&test_harness_factory_);
+  mojo::ServiceProviderPtr test_harness_provider;
+  test_harness_provider_impl_.AddService(&test_harness_factory_);
+  test_harness_provider_impl_.Bind(GetProxy(&test_harness_provider));
 
-  container->Embed(url, exported_services.Pass());
+  container->Embed(url, nullptr, test_harness_provider.Pass());
 }
 
 TestRunner::~TestRunner() {
 }
 
 base::WeakPtr<TestRunner> TestRunner::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void TestRunner::OnTestStart() {
@@ skipping 21 matching lines @@
   std::cout << "#EOF\n";
   std::cout.flush();
   std::cerr << "#EOF\n";
   std::cerr.flush();
 
   client_->OnTestComplete();
 }
 
 }  // namespace tester
 }  // namespace sky