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_aura_mus_test_suite.h" | 5 #include "ui/views/mus/views_aura_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/run_loop.h" | 13 #include "base/run_loop.h" |
13 #include "base/synchronization/waitable_event.h" | 14 #include "base/synchronization/waitable_event.h" |
14 #include "base/threading/simple_thread.h" | 15 #include "base/threading/simple_thread.h" |
15 #include "base/threading/thread.h" | 16 #include "base/threading/thread.h" |
16 #include "services/service_manager/background/background_service_manager.h" | 17 #include "services/service_manager/background/background_service_manager.h" |
17 #include "services/service_manager/public/cpp/connector.h" | 18 #include "services/service_manager/public/cpp/connector.h" |
18 #include "services/service_manager/public/cpp/service.h" | 19 #include "services/service_manager/public/cpp/service.h" |
19 #include "services/service_manager/public/cpp/service_context.h" | 20 #include "services/service_manager/public/cpp/service_context.h" |
20 #include "services/ui/common/switches.h" | 21 #include "services/ui/common/switches.h" |
21 #include "testing/gtest/include/gtest/gtest.h" | 22 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 ViewsTestSuite::Initialize(); | 206 ViewsTestSuite::Initialize(); |
206 service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>(); | 207 service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>(); |
207 } | 208 } |
208 | 209 |
209 void ViewsAuraMusTestSuite::Shutdown() { | 210 void ViewsAuraMusTestSuite::Shutdown() { |
210 service_manager_connections_.reset(); | 211 service_manager_connections_.reset(); |
211 ViewsTestSuite::Shutdown(); | 212 ViewsTestSuite::Shutdown(); |
212 } | 213 } |
213 | 214 |
214 } // namespace views | 215 } // namespace views |
OLD | NEW |