OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "services/ui/public/cpp/tests/window_server_shelltest_base.h" | 5 #include "services/ui/public/cpp/tests/window_server_shelltest_base.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
12 #include "services/service_manager/public/cpp/service.h" | 12 #include "services/service_manager/public/cpp/service.h" |
13 #include "services/service_manager/public/cpp/service_test.h" | 13 #include "services/service_manager/public/cpp/service_test.h" |
14 #include "services/ui/common/switches.h" | 14 #include "services/ui/common/switches.h" |
15 #include "ui/gl/gl_switches.h" | 15 #include "ui/gl/gl_switches.h" |
16 | 16 |
17 namespace ui { | 17 namespace ui { |
18 | 18 |
19 namespace { | 19 namespace { |
20 | 20 |
21 const char kTestAppName[] = "service:mus_ws_unittests_app"; | 21 const char kTestAppName[] = "service:mus_ws_unittests_app"; |
22 | 22 |
23 class WindowServerServiceTestClient : public shell::test::ServiceTestClient { | 23 class WindowServerServiceTestClient |
| 24 : public service_manager::test::ServiceTestClient { |
24 public: | 25 public: |
25 explicit WindowServerServiceTestClient(WindowServerServiceTestBase* test) | 26 explicit WindowServerServiceTestClient(WindowServerServiceTestBase* test) |
26 : ServiceTestClient(test), test_(test) {} | 27 : ServiceTestClient(test), test_(test) {} |
27 ~WindowServerServiceTestClient() override {} | 28 ~WindowServerServiceTestClient() override {} |
28 | 29 |
29 private: | 30 private: |
30 // shell::test::ServiceTestClient: | 31 // service_manager::test::ServiceTestClient: |
31 bool OnConnect(const shell::Identity& remote_identity, | 32 bool OnConnect(const service_manager::Identity& remote_identity, |
32 shell::InterfaceRegistry* registry) override { | 33 service_manager::InterfaceRegistry* registry) override { |
33 return test_->OnConnect(remote_identity, registry); | 34 return test_->OnConnect(remote_identity, registry); |
34 } | 35 } |
35 | 36 |
36 WindowServerServiceTestBase* test_; | 37 WindowServerServiceTestBase* test_; |
37 | 38 |
38 DISALLOW_COPY_AND_ASSIGN(WindowServerServiceTestClient); | 39 DISALLOW_COPY_AND_ASSIGN(WindowServerServiceTestClient); |
39 }; | 40 }; |
40 | 41 |
41 void EnsureCommandLineSwitch(const std::string& name) { | 42 void EnsureCommandLineSwitch(const std::string& name) { |
42 base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); | 43 base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); |
43 if (!cmd_line->HasSwitch(name)) | 44 if (!cmd_line->HasSwitch(name)) |
44 cmd_line->AppendSwitch(name); | 45 cmd_line->AppendSwitch(name); |
45 } | 46 } |
46 | 47 |
47 } // namespace | 48 } // namespace |
48 | 49 |
49 WindowServerServiceTestBase::WindowServerServiceTestBase() | 50 WindowServerServiceTestBase::WindowServerServiceTestBase() |
50 : ServiceTest(kTestAppName) { | 51 : ServiceTest(kTestAppName) { |
51 EnsureCommandLineSwitch(switches::kUseTestConfig); | 52 EnsureCommandLineSwitch(switches::kUseTestConfig); |
52 EnsureCommandLineSwitch(::switches::kOverrideUseGLWithOSMesaForTests); | 53 EnsureCommandLineSwitch(::switches::kOverrideUseGLWithOSMesaForTests); |
53 } | 54 } |
54 | 55 |
55 WindowServerServiceTestBase::~WindowServerServiceTestBase() {} | 56 WindowServerServiceTestBase::~WindowServerServiceTestBase() {} |
56 | 57 |
57 std::unique_ptr<shell::Service> | 58 std::unique_ptr<service_manager::Service> |
58 WindowServerServiceTestBase::CreateService() { | 59 WindowServerServiceTestBase::CreateService() { |
59 return base::MakeUnique<WindowServerServiceTestClient>(this); | 60 return base::MakeUnique<WindowServerServiceTestClient>(this); |
60 } | 61 } |
61 | 62 |
62 } // namespace ui | 63 } // namespace ui |
OLD | NEW |