Index: ui/gl/test/run_all_unittests.cc |
diff --git a/ui/gl/test/run_all_unittests.cc b/ui/gl/test/run_all_unittests.cc |
index e84d8c397cc55a8a0941552b153401ef28e17c10..9f0d3c2e01a674296b639baf6062aa4c902c095b 100644 |
--- a/ui/gl/test/run_all_unittests.cc |
+++ b/ui/gl/test/run_all_unittests.cc |
@@ -10,6 +10,12 @@ |
#include "base/test/mock_chrome_application_mac.h" |
#endif |
+#if defined(USE_OZONE) |
+#include "ui/ozone/public/client_native_pixmap_factory.h" |
+#include "ui/ozone/public/ozone_gpu_test_helper.h" |
+#include "ui/ozone/public/ozone_platform.h" |
+#endif |
+ |
namespace { |
class GlTestSuite : public base::TestSuite { |
@@ -21,6 +27,17 @@ class GlTestSuite : public base::TestSuite { |
void Initialize() override { |
base::TestSuite::Initialize(); |
+#if defined(USE_OZONE) |
+ ozone_ = ui::OzoneInitializerForTest::Create(); |
+ DCHECK(ozone_); |
+ |
+ client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); |
+ ui::ClientNativePixmapFactory::SetInstance( |
+ client_native_pixmap_factory_.get()); |
+ ui::ClientNativePixmapFactory::GetInstance()->Initialize( |
+ ui::OzonePlatform::GetInstance()->OpenClientNativePixmapDevice()); |
+#endif |
+ // TODO(reveman): initialize SurfaceTextureManager or IOSurfaceManager |
#if defined(OS_MACOSX) && !defined(OS_IOS) |
mock_cr_app::RegisterMockCrApp(); |
#endif |
@@ -31,6 +48,10 @@ class GlTestSuite : public base::TestSuite { |
} |
private: |
+#if defined(USE_OZONE) |
+ scoped_ptr<ui::OzoneInitializerForTest> ozone_; |
+ scoped_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; |
+#endif |
DISALLOW_COPY_AND_ASSIGN(GlTestSuite); |
}; |