Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / mojo / services / public / cpp / view_manager / lib / view_manager_test_suite.cc

diff --git a/src/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc b/src/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc
index 565b469..818b04d 100644 (file)
--- a/src/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc
+++ b/src/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc
@@ -6,8 +6,11 @@
 
 #include "ui/gl/gl_surface.h"
 
+#if defined(USE_X11)
+#include "ui/gfx/x/x11_connection.h"
+#endif
+
 namespace mojo {
-namespace view_manager {
 
 ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
@@ -16,9 +19,14 @@ ViewManagerTestSuite::~ViewManagerTestSuite() {
 }
 
 void ViewManagerTestSuite::Initialize() {
+#if defined(USE_X11)
+  // Each test ends up creating a new thread for the native viewport service.
+  // In other words we'll use X on different threads, so tell it that.
+  gfx::InitializeThreadedX11();
+#endif
+
   base::TestSuite::Initialize();
   gfx::GLSurface::InitializeOneOffForTests();
 }
 
-}  // namespace view_manager
 }  // namespace mojo