Fix OMX VDA unittest for ARM.

content/common/gpu/media/rendering_helper_gl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/rendering_helper.h"
 
 #include <map>
 
 #if defined(OS_WIN) || defined(ARCH_CPU_ARMEL)
 #include "third_party/angle/include/EGL/egl.h"  // Must precede ui/gl headers!
 #endif
 
 #include "base/bind.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/message_loop.h"
 #include "base/stringize_macros.h"
 #include "base/synchronization/waitable_event.h"
+#if !defined(ARCH_CPU_ARMEL)
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
+#else
+#include "third_party/angle/include/GLES2/gl2.h"
+#endif
 
 #if !defined(OS_WIN) && defined(ARCH_CPU_X86_FAMILY)
 #define GL_VARIANT_GLX 1
 typedef GLXWindow NativeWindowType;
 typedef GLXContext NativeContextType;
 struct ScopedPtrXFree {
   void operator()(void* x) const { ::XFree(x); }
 };
 #else
 #define GL_VARIANT_EGL 1
@@ skipping 142 matching lines @@
   suppress_swap_to_display_ = suppress_swap_to_display;
   CHECK_GT(width, 0);
   CHECK_GT(height, 0);
   width_ = width;
   height_ = height;
   message_loop_ = MessageLoop::current();
   CHECK_GT(num_windows, 0);
 
 #if GL_VARIANT_GLX
   x_display_ = base::MessagePumpForUI::GetDefaultXDisplay();
+  CHECK(x_display_);
   gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
   CHECK(glXQueryVersion(x_display_, NULL, NULL));
   const int fbconfig_attr[] = {
     GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
     GLX_RENDER_TYPE, GLX_RGBA_BIT,
     GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT,
     GLX_BIND_TO_TEXTURE_RGB_EXT, GL_TRUE,
     GLX_Y_INVERTED_EXT, GL_FALSE,
     GLX_RED_SIZE, 1,
     GLX_GREEN_SIZE, 1,
     GLX_BLUE_SIZE, 1,
     GLX_ALPHA_SIZE, 1,
     GLX_DOUBLEBUFFER, True,
     GL_NONE,
   };
   int num_fbconfigs;
   scoped_ptr_malloc<GLXFBConfig, ScopedPtrXFree> glx_fb_configs(
       glXChooseFBConfig(x_display_, DefaultScreen(x_display_), fbconfig_attr,
                         &num_fbconfigs));
   CHECK(glx_fb_configs.get());
   CHECK_GT(num_fbconfigs, 0);
   x_visual_ = glXGetVisualFromFBConfig(x_display_, glx_fb_configs.get()[0]);
   CHECK(x_visual_);
   gl_context_ = glXCreateContext(x_display_, x_visual_, 0, true);
   CHECK(gl_context_);
 
 #else // EGL
 #if defined(OS_WIN)
   gl_display_ = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+  CHECK(gl_display_);
   CHECK(eglInitialize(gl_display_, NULL, NULL)) << glGetError();
 #else
   x_display_ = base::MessagePumpForUI::GetDefaultXDisplay();
+  CHECK(x_display_);
   gl_display_ = eglGetDisplay(x_display_);
+  CHECK(gl_display_);
   CHECK(eglInitialize(gl_display_, NULL, NULL)) << glGetError();
 #endif
   static EGLint rgba8888[] = {
     EGL_RED_SIZE, 8,
     EGL_GREEN_SIZE, 8,
     EGL_BLUE_SIZE, 8,
     EGL_ALPHA_SIZE, 8,
     EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
     EGL_NONE,
   };
@@ skipping 208 matching lines @@
     CHECK(XUnmapWindow(x_display_, x_windows_[i]));
     CHECK(XDestroyWindow(x_display_, x_windows_[i]));
   }
   // Mimic newly created object.
   x_display_ = NULL;
   x_windows_.clear();
 #endif
 }
 
 }  // namespace video_test_util