From a12855418a74cf01d26d281231079a6ec5da710d Mon Sep 17 00:00:00 2001
From: "lionel.g.landwerlin" <lionel.g.landwerlin@intel.com>
Date: Wed, 3 Dec 2014 03:57:57 -0800
Subject: ui: compositor: setup in-process gpu ipc forwarding on ozone

BUG=437864
TEST=run ash_unittests on ozone/freon image

Review URL: https://codereview.chromium.org/767273002

Cr-Commit-Position: refs/heads/master@{#306590}
---
 ash/test/ash_test_helper.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'ash/test/ash_test_helper.cc')

diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 86a50d5..97abff0 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -40,6 +40,11 @@
 #include "ui/aura/window_tree_host_x11.h"
 #endif
 
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/ui_thread_gpu.h"
+#endif
+
 namespace ash {
 namespace test {
 
@@ -51,6 +56,12 @@ AshTestHelper::AshTestHelper(base::MessageLoopForUI* message_loop)
   CHECK(message_loop_);
 #if defined(USE_X11)
   aura::test::SetUseOverrideRedirectWindowByDefault(true);
+#elif defined(USE_OZONE)
+  // On Ozone we need to setup the in process gpu-process components
+  // dealing with the display.
+  ui::OzonePlatform::InitializeForUI();
+  ui_thread_.reset(new ui::UiThreadGpu);
+  ui_thread_->Initialize();
 #endif
   aura::test::InitializeAuraEventGeneratorDelegate();
 }
-- 
cgit v1.1