Commit cc39bb88 authored by Antoine Labour's avatar Antoine Labour

Revert "Don't initialize Ozone platform if running unit tests with OSMesa"

This reverts commit b1dfa83e.

Broke Linux ChromiumOS Ozone Tests:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Ozone%20Tests%20%281%29/builds/5338/steps/interactive_ui_tests/logs/stdio

TBR=gusfernandez@chromium.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#301464}
parent 75520f4e
......@@ -38,12 +38,12 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
// unit tests have initialized with kGLImplementationMock, we don't want to
// later switch to another GL implementation.
DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
ui::OzonePlatform::InitializeForGPU();
switch (implementation) {
case kGLImplementationOSMesaGL:
return InitializeStaticGLBindingsOSMesaGL();
case kGLImplementationEGLGLES2:
ui::OzonePlatform::InitializeForGPU();
if (!ui::SurfaceFactoryOzone::GetInstance()->LoadEGLGLES2Bindings(
base::Bind(&AddGLNativeLibrary),
base::Bind(&SetGLGetProcAddressProc)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment