video: On ChromeOS don't assume GLX always.

content/common/gpu/media/gpu_video_decode_accelerator.cc

Index: content/common/gpu/media/gpu_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
index 3a86c48688ab04141955c5c530281ed1f6353cd8..9888212d1f9fb9c4f18f497cbb189a692bfae24a 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -28,8 +28,9 @@
 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11)
 #include "content/common/gpu/media/exynos_video_decode_accelerator.h"
 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
-#include "ui/gl/gl_context_glx.h"
 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
+#include "ui/gl/gl_context_glx.h"
+#include "ui/gl/gl_implementation.h"
 #elif defined(OS_ANDROID)
 #include "content/common/gpu/media/android_video_decode_accelerator.h"
 #endif
@@ -278,6 +279,12 @@ void GpuVideoDecodeAccelerator::Initialize(
       make_context_current_,
       io_message_loop_));
 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
+  if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) {
+    LOG(ERROR) << "HW video decode acceleration not available without "

[Ami GONE FROM CHROMIUM, 2014/01/09 23:35:43]

Your CL description makes it sound like this condition is going to be expected
on some bots.  s/ERROR/INFO/ here?  Or even VLOG(1)?

[danakj, 2014/01/10 01:10:40]

It's true, this will happen on linux_chromeos since that runs in a linux Xvfb,
not on a ChromeOS VM. VLOG(1) it is.

+                  "DesktopGL (GLX).";
+    NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
+    return;
+  }
   gfx::GLContextGLX* glx_context =
       static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext());
   video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator(