| Index: services/ui/public/cpp/tests/window_server_shelltest_base.h
|
| diff --git a/services/ui/public/cpp/tests/window_server_shelltest_base.h b/services/ui/public/cpp/tests/window_server_shelltest_base.h
|
| index a0d6d03566bd34e2cffa449d052375088e45fc7e..7e6ebab519613179f79bacf8f311b9c1e7f14da7 100644
|
| --- a/services/ui/public/cpp/tests/window_server_shelltest_base.h
|
| +++ b/services/ui/public/cpp/tests/window_server_shelltest_base.h
|
| @@ -12,17 +12,17 @@
|
| namespace ui {
|
|
|
| // Base class for all window manager ServiceTests to perform some common setup.
|
| -class WindowServerServiceTestBase : public shell::test::ServiceTest {
|
| +class WindowServerServiceTestBase : public service_manager::test::ServiceTest {
|
| public:
|
| WindowServerServiceTestBase();
|
| ~WindowServerServiceTestBase() override;
|
|
|
| - virtual bool OnConnect(const shell::Identity& remote_identity,
|
| - shell::InterfaceRegistry* registry) = 0;
|
| + virtual bool OnConnect(const service_manager::Identity& remote_identity,
|
| + service_manager::InterfaceRegistry* registry) = 0;
|
|
|
| private:
|
| - // shell::test::ServiceTest:
|
| - std::unique_ptr<shell::Service> CreateService() override;
|
| + // service_manager::test::ServiceTest:
|
| + std::unique_ptr<service_manager::Service> CreateService() override;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WindowServerServiceTestBase);
|
| };
|
|
|