| 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 "ui/views/mus/views_mus_test_suite.h" | 5 #include "ui/views/mus/views_mus_test_suite.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
| 12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
| 13 #include "base/message_loop/message_loop.h" |
| 13 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
| 14 #include "base/synchronization/waitable_event.h" | 15 #include "base/synchronization/waitable_event.h" |
| 15 #include "base/threading/simple_thread.h" | 16 #include "base/threading/simple_thread.h" |
| 16 #include "base/threading/thread.h" | 17 #include "base/threading/thread.h" |
| 17 #include "mojo/edk/embedder/embedder.h" | 18 #include "mojo/edk/embedder/embedder.h" |
| 18 #include "mojo/edk/embedder/scoped_ipc_support.h" | 19 #include "mojo/edk/embedder/scoped_ipc_support.h" |
| 19 #include "services/catalog/catalog.h" | 20 #include "services/catalog/catalog.h" |
| 20 #include "services/service_manager/background/background_service_manager.h" | 21 #include "services/service_manager/background/background_service_manager.h" |
| 21 #include "services/service_manager/public/cpp/connector.h" | 22 #include "services/service_manager/public/cpp/connector.h" |
| 22 #include "services/service_manager/public/cpp/service.h" | 23 #include "services/service_manager/public/cpp/service.h" |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 | 264 |
| 264 void ViewsMusTestSuite::InitializeEnv() { | 265 void ViewsMusTestSuite::InitializeEnv() { |
| 265 env_ = aura::Env::CreateInstance(aura::Env::Mode::MUS); | 266 env_ = aura::Env::CreateInstance(aura::Env::Mode::MUS); |
| 266 } | 267 } |
| 267 | 268 |
| 268 void ViewsMusTestSuite::DestroyEnv() { | 269 void ViewsMusTestSuite::DestroyEnv() { |
| 269 env_.reset(); | 270 env_.reset(); |
| 270 } | 271 } |
| 271 | 272 |
| 272 } // namespace views | 273 } // namespace views |
| OLD | NEW |