| 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" |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 | 188 |
| 189 DISALLOW_COPY_AND_ASSIGN(ServiceManagerConnection); | 189 DISALLOW_COPY_AND_ASSIGN(ServiceManagerConnection); |
| 190 }; | 190 }; |
| 191 | 191 |
| 192 ViewsAuraMusTestSuite::ViewsAuraMusTestSuite(int argc, char** argv) | 192 ViewsAuraMusTestSuite::ViewsAuraMusTestSuite(int argc, char** argv) |
| 193 : ViewsTestSuite(argc, argv) {} | 193 : ViewsTestSuite(argc, argv) {} |
| 194 | 194 |
| 195 ViewsAuraMusTestSuite::~ViewsAuraMusTestSuite() {} | 195 ViewsAuraMusTestSuite::~ViewsAuraMusTestSuite() {} |
| 196 | 196 |
| 197 void ViewsAuraMusTestSuite::Initialize() { | 197 void ViewsAuraMusTestSuite::Initialize() { |
| 198 PlatformTestHelper::SetIsAuraMusClient(); | 198 PlatformTestHelper::SetIsMus(); |
| 199 // Let other services know that we're running in tests. Do this with a | 199 // Let other services know that we're running in tests. Do this with a |
| 200 // command line flag to avoid making blocking calls to other processes for | 200 // command line flag to avoid making blocking calls to other processes for |
| 201 // setup for tests (e.g. to unlock the screen in the window manager). | 201 // setup for tests (e.g. to unlock the screen in the window manager). |
| 202 EnsureCommandLineSwitch(ui::switches::kUseTestConfig); | 202 EnsureCommandLineSwitch(ui::switches::kUseTestConfig); |
| 203 | 203 |
| 204 EnsureCommandLineSwitch(switches::kOverrideUseGLWithOSMesaForTests); | 204 EnsureCommandLineSwitch(switches::kOverrideUseGLWithOSMesaForTests); |
| 205 | 205 |
| 206 ViewsTestSuite::Initialize(); | 206 ViewsTestSuite::Initialize(); |
| 207 service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>(); | 207 service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>(); |
| 208 } | 208 } |
| 209 | 209 |
| 210 void ViewsAuraMusTestSuite::Shutdown() { | 210 void ViewsAuraMusTestSuite::Shutdown() { |
| 211 service_manager_connections_.reset(); | 211 service_manager_connections_.reset(); |
| 212 ViewsTestSuite::Shutdown(); | 212 ViewsTestSuite::Shutdown(); |
| 213 } | 213 } |
| 214 | 214 |
| 215 } // namespace views | 215 } // namespace views |
| OLD | NEW |