| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_test_base.h" | 5 #include "services/ui/public/cpp/tests/window_server_test_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 12 #include "base/test/test_timeouts.h" | 12 #include "base/test/test_timeouts.h" |
| 13 #include "base/threading/thread_task_runner_handle.h" | 13 #include "base/threading/thread_task_runner_handle.h" |
| 14 #include "services/service_manager/public/cpp/connector.h" | 14 #include "services/service_manager/public/cpp/connector.h" |
| 15 #include "services/service_manager/public/cpp/interface_registry.h" |
| 15 #include "services/ui/public/cpp/window.h" | 16 #include "services/ui/public/cpp/window.h" |
| 16 #include "services/ui/public/cpp/window_tree_client.h" | 17 #include "services/ui/public/cpp/window_tree_client.h" |
| 17 | 18 |
| 18 namespace ui { | 19 namespace ui { |
| 19 namespace { | 20 namespace { |
| 20 | 21 |
| 21 base::RunLoop* current_run_loop = nullptr; | 22 base::RunLoop* current_run_loop = nullptr; |
| 22 | 23 |
| 23 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) { | 24 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) { |
| 24 CHECK(current_run_loop); | 25 CHECK(current_run_loop); |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 } | 190 } |
| 190 | 191 |
| 191 void WindowServerTestBase::Create( | 192 void WindowServerTestBase::Create( |
| 192 const service_manager::Identity& remote_identity, | 193 const service_manager::Identity& remote_identity, |
| 193 mojom::WindowTreeClientRequest request) { | 194 mojom::WindowTreeClientRequest request) { |
| 194 window_tree_clients_.insert( | 195 window_tree_clients_.insert( |
| 195 base::MakeUnique<WindowTreeClient>(this, nullptr, std::move(request))); | 196 base::MakeUnique<WindowTreeClient>(this, nullptr, std::move(request))); |
| 196 } | 197 } |
| 197 | 198 |
| 198 } // namespace ui | 199 } // namespace ui |
| OLD | NEW |