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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "services/service_manager/public/cpp/service_test.h" | 8 #include "services/service_manager/public/cpp/service_test.h" |
9 #include "services/ui/public/interfaces/window_server_test.mojom.h" | 9 #include "services/ui/public/interfaces/window_server_test.mojom.h" |
10 | 10 |
11 namespace ash { | 11 namespace ash { |
12 namespace mus { | 12 namespace mus { |
13 | 13 |
14 void RunCallback(bool* success, const base::Closure& callback, bool result) { | 14 void RunCallback(bool* success, const base::Closure& callback, bool result) { |
15 *success = result; | 15 *success = result; |
16 callback.Run(); | 16 callback.Run(); |
17 } | 17 } |
18 | 18 |
19 class AppLaunchTest : public shell::test::ServiceTest { | 19 class AppLaunchTest : public service_manager::test::ServiceTest { |
20 public: | 20 public: |
21 AppLaunchTest() : ServiceTest("exe:mash_unittests") {} | 21 AppLaunchTest() : ServiceTest("exe:mash_unittests") {} |
22 ~AppLaunchTest() override {} | 22 ~AppLaunchTest() override {} |
23 | 23 |
24 private: | 24 private: |
25 void SetUp() override { | 25 void SetUp() override { |
26 base::CommandLine::ForCurrentProcess()->AppendSwitch("use-test-config"); | 26 base::CommandLine::ForCurrentProcess()->AppendSwitch("use-test-config"); |
27 ServiceTest::SetUp(); | 27 ServiceTest::SetUp(); |
28 } | 28 } |
29 | 29 |
(...skipping 11 matching lines...) Expand all Loading... |
41 bool success = false; | 41 bool success = false; |
42 test_interface->EnsureClientHasDrawnWindow( | 42 test_interface->EnsureClientHasDrawnWindow( |
43 "service:quick_launch", | 43 "service:quick_launch", |
44 base::Bind(&RunCallback, &success, run_loop.QuitClosure())); | 44 base::Bind(&RunCallback, &success, run_loop.QuitClosure())); |
45 run_loop.Run(); | 45 run_loop.Run(); |
46 EXPECT_TRUE(success); | 46 EXPECT_TRUE(success); |
47 } | 47 } |
48 | 48 |
49 } // namespace mus | 49 } // namespace mus |
50 } // namespace ash | 50 } // namespace ash |
OLD | NEW |