OLD | NEW |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/ws/gpu_host.h" | 5 #include "services/ui/ws/gpu_host.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| 11 #include "base/single_thread_task_runner.h" |
11 #include "gpu/config/gpu_info.h" | 12 #include "gpu/config/gpu_info.h" |
12 #include "services/ui/gpu/gpu_service.h" | 13 #include "services/ui/gpu/gpu_service.h" |
13 #include "services/ui/public/interfaces/gpu.mojom.h" | 14 #include "services/ui/public/interfaces/gpu.mojom.h" |
14 #include "services/ui/ws/gpu_client.h" | 15 #include "services/ui/ws/gpu_client.h" |
15 #include "services/ui/ws/gpu_host_delegate.h" | 16 #include "services/ui/ws/gpu_host_delegate.h" |
16 | 17 |
17 #if defined(USE_X11) | 18 #if defined(USE_X11) |
18 #include <X11/Xlib.h> | 19 #include <X11/Xlib.h> |
19 #undef None | 20 #undef None |
20 #undef Bool | 21 #undef Bool |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 TEST_F(GpuHostTest, GpuClientDestructionOrder) { | 114 TEST_F(GpuHostTest, GpuClientDestructionOrder) { |
114 base::WeakPtr<GpuClient> client_ref = AddGpuClient(); | 115 base::WeakPtr<GpuClient> client_ref = AddGpuClient(); |
115 EXPECT_NE(nullptr, client_ref); | 116 EXPECT_NE(nullptr, client_ref); |
116 DestroyHost(); | 117 DestroyHost(); |
117 EXPECT_EQ(nullptr, client_ref); | 118 EXPECT_EQ(nullptr, client_ref); |
118 } | 119 } |
119 | 120 |
120 } // namespace test | 121 } // namespace test |
121 } // namespace ws | 122 } // namespace ws |
122 } // namespace ui | 123 } // namespace ui |
OLD | NEW |