| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/view_manager_test_suite.h" | 5 #include "components/mus/public/cpp/tests/mandoline_ui_services_test_suite.h" |
| 6 | 6 |
| 7 #include "base/i18n/icu_util.h" | 7 #include "base/i18n/icu_util.h" |
| 8 | 8 |
| 9 #if defined(USE_X11) | 9 #if defined(USE_X11) |
| 10 #include "ui/gfx/x/x11_connection.h" | 10 #include "ui/gfx/x/x11_connection.h" |
| 11 #endif | 11 #endif |
| 12 | 12 |
| 13 namespace mojo { | 13 namespace mus { |
| 14 | 14 |
| 15 ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv) | 15 MandolineUIServicesTestSuite::MandolineUIServicesTestSuite(int argc, |
| 16 char** argv) |
| 16 : TestSuite(argc, argv) {} | 17 : TestSuite(argc, argv) {} |
| 17 | 18 |
| 18 ViewManagerTestSuite::~ViewManagerTestSuite() {} | 19 MandolineUIServicesTestSuite::~MandolineUIServicesTestSuite() {} |
| 19 | 20 |
| 20 void ViewManagerTestSuite::Initialize() { | 21 void MandolineUIServicesTestSuite::Initialize() { |
| 21 #if defined(USE_X11) | 22 #if defined(USE_X11) |
| 22 // Each test ends up creating a new thread for the native viewport service. | 23 // Each test ends up creating a new thread for the native viewport service. |
| 23 // In other words we'll use X on different threads, so tell it that. | 24 // In other words we'll use X on different threads, so tell it that. |
| 24 gfx::InitializeThreadedX11(); | 25 gfx::InitializeThreadedX11(); |
| 25 #endif | 26 #endif |
| 26 | 27 |
| 27 base::TestSuite::Initialize(); | 28 base::TestSuite::Initialize(); |
| 28 | 29 |
| 29 // base::TestSuite and ViewsInit both try to load icu. That's ok for tests. | 30 // base::TestSuite and ViewsInit both try to load icu. That's ok for tests. |
| 30 base::i18n::AllowMultipleInitializeCallsForTesting(); | 31 base::i18n::AllowMultipleInitializeCallsForTesting(); |
| 31 } | 32 } |
| 32 | 33 |
| 33 } // namespace mojo | 34 } // namespace mus |
| OLD | NEW |