| 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 "components/mus/public/cpp/tests/window_server_test_base.h" | 5 #include "components/mus/public/cpp/tests/window_server_test_base.h" | 
| 6 | 6 | 
| 7 #include "base/bind.h" | 7 #include "base/bind.h" | 
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" | 
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" | 
| 10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" | 
| 11 #include "components/mus/public/cpp/window.h" | 11 #include "components/mus/public/cpp/window.h" | 
| 12 #include "components/mus/public/cpp/window_tree_connection.h" | 12 #include "components/mus/public/cpp/window_tree_connection.h" | 
| 13 #include "components/mus/public/cpp/window_tree_host_factory.h" | 13 #include "components/mus/public/cpp/window_tree_host_factory.h" | 
| 14 #include "mojo/shell/public/cpp/connector.h" | 14 #include "services/shell/public/cpp/connector.h" | 
| 15 | 15 | 
| 16 namespace mus { | 16 namespace mus { | 
| 17 namespace { | 17 namespace { | 
| 18 | 18 | 
| 19 base::RunLoop* current_run_loop = nullptr; | 19 base::RunLoop* current_run_loop = nullptr; | 
| 20 | 20 | 
| 21 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) { | 21 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) { | 
| 22   CHECK(current_run_loop); | 22   CHECK(current_run_loop); | 
| 23   *timeout = true; | 23   *timeout = true; | 
| 24   timeout_task.Run(); | 24   timeout_task.Run(); | 
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 120 | 120 | 
| 121 void WindowServerTestBase::Create( | 121 void WindowServerTestBase::Create( | 
| 122     mojo::Connection* connection, | 122     mojo::Connection* connection, | 
| 123     mojo::InterfaceRequest<mojom::WindowTreeClient> request) { | 123     mojo::InterfaceRequest<mojom::WindowTreeClient> request) { | 
| 124   WindowTreeConnection::Create( | 124   WindowTreeConnection::Create( | 
| 125       this, std::move(request), | 125       this, std::move(request), | 
| 126       WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); | 126       WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); | 
| 127 } | 127 } | 
| 128 | 128 | 
| 129 }  // namespace mus | 129 }  // namespace mus | 
| OLD | NEW | 
|---|