Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Side by Side Diff: mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

Issue 516523004: Fixes to get view_manager_lib_unittests not crash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/examples/window_manager/window_manager.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h" 5 #include "mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h"
6 6
7 #include "base/i18n/icu_util.h"
7 #include "ui/gl/gl_surface.h" 8 #include "ui/gl/gl_surface.h"
8 9
9 #if defined(USE_X11) 10 #if defined(USE_X11)
10 #include "ui/gfx/x/x11_connection.h" 11 #include "ui/gfx/x/x11_connection.h"
11 #endif 12 #endif
12 13
13 namespace mojo { 14 namespace mojo {
14 15
15 ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv) 16 ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv)
16 : TestSuite(argc, argv) {} 17 : TestSuite(argc, argv) {}
17 18
18 ViewManagerTestSuite::~ViewManagerTestSuite() { 19 ViewManagerTestSuite::~ViewManagerTestSuite() {
19 } 20 }
20 21
21 void ViewManagerTestSuite::Initialize() { 22 void ViewManagerTestSuite::Initialize() {
22 #if defined(USE_X11) 23 #if defined(USE_X11)
23 // Each test ends up creating a new thread for the native viewport service. 24 // Each test ends up creating a new thread for the native viewport service.
24 // In other words we'll use X on different threads, so tell it that. 25 // In other words we'll use X on different threads, so tell it that.
25 gfx::InitializeThreadedX11(); 26 gfx::InitializeThreadedX11();
26 #endif 27 #endif
27 28
28 base::TestSuite::Initialize(); 29 base::TestSuite::Initialize();
29 gfx::GLSurface::InitializeOneOffForTests(); 30 gfx::GLSurface::InitializeOneOffForTests();
31
32 // base::TestSuite and ViewsInit both try to load icu. That's ok for tests.
33 base::i18n::AllowMultipleInitializeCallsForTesting();
30 } 34 }
31 35
32 } // namespace mojo 36 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/examples/window_manager/window_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698