video: On ChromeOS don't assume GLX always.

content/common/gpu/media/video_decode_accelerator_unittest.cc

Index: content/common/gpu/media/video_decode_accelerator_unittest.cc
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc
index 34df90cf9e450889edf4f38635eeba4310267e0a..19c8bfaa5b01da8fee712447096fbce0862627ea 100644
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc
@@ -59,6 +59,9 @@
 #elif defined(ARCH_CPU_X86_FAMILY)
 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
 #include "content/common/gpu/media/vaapi_wrapper.h"
+#if defined(USE_X11)
+#include "ui/gl/gl_implementation.h"
+#endif  // USE_X11
 #endif  // ARCH_CPU_ARMEL
 #else
 #error The VideoAccelerator tests are not supported on this platform.
@@ -532,6 +535,7 @@ GLRenderingVDAClient::~GLRenderingVDAClient() {
 static bool DoNothingReturnTrue() { return true; }
 
 void GLRenderingVDAClient::CreateAndStartDecoder() {
+  CHECK_EQ(gfx::kGLImplementationDesktopGL, gfx::GetGLImplementation());

[Ami GONE FROM CHROMIUM, 2014/01/10 01:15:10]

I expected you to put this inside the cros&&x86 #if (l.560 below).  As it is I
think it'll fail (incorrectly) on cros/arm, where we use EGL/GLES2.

[danakj, 2014/01/10 01:18:14]

Right, I just had changed it to check != OSMesa instead of == DesktopGL.  But I
can move it down to the #if also. Thanks!

   CHECK(decoder_deleted());
   CHECK(!decoder_.get());