| Index: content/public/test/test_service.h
|
| diff --git a/content/public/test/test_mojo_app.h b/content/public/test/test_service.h
|
| similarity index 60%
|
| rename from content/public/test/test_mojo_app.h
|
| rename to content/public/test/test_service.h
|
| index 7ee56f120e0ceeb688f1a0e7ceb5d655d8878b97..574931c6de4f3abc63122ae191bb31fe1e6e0b5d 100644
|
| --- a/content/public/test/test_mojo_app.h
|
| +++ b/content/public/test/test_service.h
|
| @@ -2,40 +2,40 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_PUBLIC_TEST_TEST_MOJO_APP_H_
|
| -#define CONTENT_PUBLIC_TEST_TEST_MOJO_APP_H_
|
| +#ifndef CONTENT_PUBLIC_TEST_TEST_SERVICE_H_
|
| +#define CONTENT_PUBLIC_TEST_TEST_SERVICE_H_
|
|
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "content/public/test/test_mojo_service.mojom.h"
|
| +#include "content/public/test/test_service.mojom.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| #include "services/shell/public/cpp/interface_factory.h"
|
| #include "services/shell/public/cpp/service.h"
|
|
|
| namespace content {
|
|
|
| -extern const char kTestMojoAppUrl[];
|
| +extern const char kTestServiceUrl[];
|
|
|
| -// Simple Mojo app which provides a mojom::TestMojoService impl. The app
|
| +// Simple Service which provides a mojom::TestService impl. The service
|
| // terminates itself after its TestService fulfills a single DoSomething call.
|
| -class TestMojoApp : public shell::Service,
|
| - public shell::InterfaceFactory<mojom::TestMojoService>,
|
| - public mojom::TestMojoService {
|
| +class TestService : public shell::Service,
|
| + public shell::InterfaceFactory<mojom::TestService>,
|
| + public mojom::TestService {
|
| public:
|
| - TestMojoApp();
|
| - ~TestMojoApp() override;
|
| + TestService();
|
| + ~TestService() override;
|
|
|
| private:
|
| // shell::Service:
|
| bool OnConnect(const shell::Identity& remote_identity,
|
| shell::InterfaceRegistry* registry) override;
|
|
|
| - // shell::InterfaceFactory<mojom::TestMojoService>:
|
| + // shell::InterfaceFactory<mojom::TestService>:
|
| void Create(const shell::Identity& remote_identity,
|
| - mojo::InterfaceRequest<mojom::TestMojoService> request) override;
|
| + mojom::TestServiceRequest request) override;
|
|
|
| - // TestMojoService:
|
| + // TestService:
|
| void DoSomething(const DoSomethingCallback& callback) override;
|
| void DoTerminateProcess(const DoTerminateProcessCallback& callback) override;
|
| void CreateFolder(const CreateFolderCallback& callback) override;
|
| @@ -43,14 +43,14 @@ class TestMojoApp : public shell::Service,
|
| void CreateSharedBuffer(const std::string& message,
|
| const CreateSharedBufferCallback& callback) override;
|
|
|
| - mojo::Binding<mojom::TestMojoService> service_binding_;
|
| + mojo::Binding<mojom::TestService> service_binding_;
|
|
|
| // The name of the app connecting to us.
|
| std::string requestor_name_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(TestMojoApp);
|
| + DISALLOW_COPY_AND_ASSIGN(TestService);
|
| };
|
|
|
| } // namespace content
|
|
|
| -#endif // CONTENT_PUBLIC_TEST_TEST_MOJO_APP_H_
|
| +#endif // CONTENT_PUBLIC_TEST_TEST_SERVICE_H_
|
|
|