| Index: mojo/public/cpp/bindings/tests/versioning_test_service.cc
|
| diff --git a/mojo/public/cpp/bindings/tests/versioning_test_service.cc b/mojo/public/cpp/bindings/tests/versioning_test_service.cc
|
| index 1c6beb418bc52fb9c3e1d7f35fc95308ede7e47c..007a82addb653610d766b7d07002d4fef8ddd7fd 100644
|
| --- a/mojo/public/cpp/bindings/tests/versioning_test_service.cc
|
| +++ b/mojo/public/cpp/bindings/tests/versioning_test_service.cc
|
| @@ -10,10 +10,9 @@
|
| #include "mojo/public/cpp/bindings/strong_binding.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| #include "mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h"
|
| -#include "mojo/shell/public/cpp/application_connection.h"
|
| -#include "mojo/shell/public/cpp/application_delegate.h"
|
| #include "mojo/shell/public/cpp/application_runner.h"
|
| #include "mojo/shell/public/cpp/interface_factory.h"
|
| +#include "mojo/shell/public/cpp/shell_client.h"
|
|
|
| namespace mojo {
|
| namespace test {
|
| @@ -95,19 +94,19 @@ class HumanResourceDatabaseImpl : public HumanResourceDatabase {
|
| };
|
|
|
| class HumanResourceSystemServer
|
| - : public ApplicationDelegate,
|
| + : public ShellClient,
|
| public InterfaceFactory<HumanResourceDatabase> {
|
| public:
|
| HumanResourceSystemServer() {}
|
|
|
| - // ApplicationDelegate implementation.
|
| - bool AcceptConnection(ApplicationConnection* connection) override {
|
| + // mojo::ShellClient implementation.
|
| + bool AcceptConnection(Connection* connection) override {
|
| connection->AddService<HumanResourceDatabase>(this);
|
| return true;
|
| }
|
|
|
| // InterfaceFactory<HumanResourceDatabase> implementation.
|
| - void Create(ApplicationConnection* connection,
|
| + void Create(Connection* connection,
|
| InterfaceRequest<HumanResourceDatabase> request) override {
|
| // It will be deleted automatically when the underlying pipe encounters a
|
| // connection error.
|
|
|