| Index: shell/test/pingable_app.cc
|
| diff --git a/shell/test/pingable_app.cc b/shell/test/pingable_app.cc
|
| index 2436a7dcba4d70b46d8e975d3487ffc099123f01..f4520f6556eff039e66bb24ae2472331fe8374b5 100644
|
| --- a/shell/test/pingable_app.cc
|
| +++ b/shell/test/pingable_app.cc
|
| @@ -8,7 +8,6 @@
|
| #include "mojo/public/cpp/application/application_delegate.h"
|
| #include "mojo/public/cpp/application/application_impl.h"
|
| #include "mojo/public/cpp/application/application_runner.h"
|
| -#include "mojo/public/cpp/application/interface_factory.h"
|
| #include "mojo/public/cpp/bindings/callback.h"
|
| #include "mojo/public/cpp/bindings/interface_request.h"
|
| #include "mojo/public/cpp/bindings/strong_binding.h"
|
| @@ -39,8 +38,7 @@ class PingableImpl : public Pingable {
|
| std::string connection_url_;
|
| };
|
|
|
| -class PingableApp : public mojo::ApplicationDelegate,
|
| - public mojo::InterfaceFactory<Pingable> {
|
| +class PingableApp : public mojo::ApplicationDelegate {
|
| public:
|
| PingableApp() {}
|
| ~PingableApp() override {}
|
| @@ -53,17 +51,15 @@ class PingableApp : public mojo::ApplicationDelegate,
|
|
|
| bool ConfigureIncomingConnection(
|
| mojo::ApplicationConnection* connection) override {
|
| - connection->AddService(this);
|
| + connection->GetServiceProviderImpl().AddService<Pingable>(
|
| + [this](const mojo::ConnectionContext& connection_context,
|
| + mojo::InterfaceRequest<Pingable> pingable_request) {
|
| + new PingableImpl(pingable_request.Pass(), app_url_,
|
| + connection_context.connection_url);
|
| + });
|
| return true;
|
| }
|
|
|
| - // InterfaceFactory<Pingable>:
|
| - void Create(const mojo::ConnectionContext& connection_context,
|
| - mojo::InterfaceRequest<Pingable> request) override {
|
| - new PingableImpl(request.Pass(), app_url_,
|
| - connection_context.connection_url);
|
| - }
|
| -
|
| std::string app_url_;
|
| };
|
|
|
|
|