Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Unified Diff: sky/tools/tester/test_runner.cc

Issue 858103002: Remove [Client=] annotation from ServiceProvider (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: rebase for trybots (no code changes from ps2) Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/tools/tester/test_runner.h ('k') | sky/tools/tester/tester.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/tools/tester/test_runner.cc
diff --git a/sky/tools/tester/test_runner.cc b/sky/tools/tester/test_runner.cc
index b321badc303ae77693f5ab869a90e816d8388a4d..e187cfa8e44d09a73a3927472ea13ee847910db0 100644
--- a/sky/tools/tester/test_runner.cc
+++ b/sky/tools/tester/test_runner.cc
@@ -7,7 +7,6 @@
#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 {
@@ -24,11 +23,11 @@ TestRunner::TestRunner(TestRunnerClient* client, mojo::View* container,
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() {
« no previous file with comments | « sky/tools/tester/test_runner.h ('k') | sky/tools/tester/tester.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698