| OLD | NEW | 
|---|
|  | (Empty) | 
| 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 |  | 
| 3 // found in the LICENSE file. |  | 
| 4 |  | 
| 5 #include "services/ui/public/cpp/tests/window_server_test_suite.h" |  | 
| 6 |  | 
| 7 #include "base/i18n/icu_util.h" |  | 
| 8 |  | 
| 9 #if defined(USE_X11) |  | 
| 10 #include "ui/gfx/x/x11_connection.h"  // nogncheck |  | 
| 11 #endif |  | 
| 12 |  | 
| 13 namespace ui { |  | 
| 14 |  | 
| 15 WindowServerTestSuite::WindowServerTestSuite(int argc, char** argv) |  | 
| 16     : TestSuite(argc, argv) {} |  | 
| 17 |  | 
| 18 WindowServerTestSuite::~WindowServerTestSuite() {} |  | 
| 19 |  | 
| 20 void WindowServerTestSuite::Initialize() { |  | 
| 21 #if defined(USE_X11) |  | 
| 22   // 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   gfx::InitializeThreadedX11(); |  | 
| 25 #endif |  | 
| 26 |  | 
| 27   base::TestSuite::Initialize(); |  | 
| 28 |  | 
| 29   // base::TestSuite and ViewsInit both try to load icu. That's ok for tests. |  | 
| 30   base::i18n::AllowMultipleInitializeCallsForTesting(); |  | 
| 31 } |  | 
| 32 |  | 
| 33 }  // namespace ui |  | 
| OLD | NEW | 
|---|