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

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

Issue 883843002: Update mojo sdk to rev 126532ce21c5c3c55a1e1693731411cb60169efd (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to review Created 5 years, 10 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
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/view_manager/public/cpp/lib/view_manager_test_suite.h" 5 #include "mojo/services/view_manager/public/cpp/tests/view_manager_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 mojo {
14 14
15 ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv) 15 ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv)
16 : TestSuite(argc, argv) {} 16 : TestSuite(argc, argv) {}
17 17
18 ViewManagerTestSuite::~ViewManagerTestSuite() { 18 ViewManagerTestSuite::~ViewManagerTestSuite() {
19 } 19 }
20 20
21 void ViewManagerTestSuite::Initialize() { 21 void ViewManagerTestSuite::Initialize() {
22 #if defined(USE_X11) 22 #if defined(USE_X11)
23 // 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.
24 // 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.
25 gfx::InitializeThreadedX11(); 25 gfx::InitializeThreadedX11();
26 #endif 26 #endif
27 27
28 base::TestSuite::Initialize(); 28 base::TestSuite::Initialize();
29 29
30 // 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.
31 base::i18n::AllowMultipleInitializeCallsForTesting(); 31 base::i18n::AllowMultipleInitializeCallsForTesting();
32 } 32 }
33 33
34 } // namespace mojo 34 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698