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 #ifndef ASH_MUS_TEST_WM_TEST_HELPER_H_ | 5 #ifndef ASH_MUS_TEST_WM_TEST_HELPER_H_ |
6 #define ASH_MUS_TEST_WM_TEST_HELPER_H_ | 6 #define ASH_MUS_TEST_WM_TEST_HELPER_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/mus/window_manager_application.h" | 10 #include "ash/mus/window_manager_application.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "services/ui/public/cpp/tests/test_window_tree_client_setup.h" | 12 #include "services/ui/public/cpp/tests/test_window_tree_client_setup.h" |
13 | 13 |
14 namespace base { | 14 namespace base { |
15 class MessageLoop; | 15 class MessageLoop; |
| 16 class SequencedWorkerPoolOwner; |
16 } | 17 } |
17 | 18 |
18 namespace gfx { | 19 namespace gfx { |
19 class Rect; | 20 class Rect; |
20 } | 21 } |
21 | 22 |
22 namespace ui { | 23 namespace ui { |
23 class Window; | 24 class Window; |
24 } | 25 } |
25 | 26 |
(...skipping 15 matching lines...) Expand all Loading... |
41 return window_manager_app_.get(); | 42 return window_manager_app_.get(); |
42 } | 43 } |
43 | 44 |
44 WmTestScreen* screen() { return screen_; } | 45 WmTestScreen* screen() { return screen_; } |
45 | 46 |
46 private: | 47 private: |
47 std::unique_ptr<base::MessageLoop> message_loop_; | 48 std::unique_ptr<base::MessageLoop> message_loop_; |
48 ui::TestWindowTreeClientSetup window_tree_client_setup_; | 49 ui::TestWindowTreeClientSetup window_tree_client_setup_; |
49 std::unique_ptr<WindowManagerApplication> window_manager_app_; | 50 std::unique_ptr<WindowManagerApplication> window_manager_app_; |
50 WmTestScreen* screen_ = nullptr; // Owned by |window_manager_app_|. | 51 WmTestScreen* screen_ = nullptr; // Owned by |window_manager_app_|. |
| 52 std::unique_ptr<base::SequencedWorkerPoolOwner> blocking_pool_owner_; |
51 | 53 |
52 DISALLOW_COPY_AND_ASSIGN(WmTestHelper); | 54 DISALLOW_COPY_AND_ASSIGN(WmTestHelper); |
53 }; | 55 }; |
54 | 56 |
55 } // namespace mus | 57 } // namespace mus |
56 } // namespace ash | 58 } // namespace ash |
57 | 59 |
58 #endif // ASH_MUS_TEST_WM_TEST_HELPER_H_ | 60 #endif // ASH_MUS_TEST_WM_TEST_HELPER_H_ |
OLD | NEW |