Enable HW VAVDA by libva-wayland backend.

content/common/gpu/media/vaapi_video_decode_accelerator.h

Index: content/common/gpu/media/vaapi_video_decode_accelerator.h
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.h b/content/common/gpu/media/vaapi_video_decode_accelerator.h
index 37b9c7fb013016da5737a724711db1f31e930729..a3d869c9ed638e0387aeb07553c84616137c448a 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.h
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.h
@@ -8,6 +8,10 @@
 #ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
 
+#if defined(USE_OZONE)
+#include <wayland-client.h>
+#endif
+#include <list>
 #include <map>
 #include <queue>
 #include <utility>
@@ -44,9 +48,14 @@ namespace content {
 class CONTENT_EXPORT VaapiVideoDecodeAccelerator
     : public VideoDecodeAcceleratorImpl {
  public:
+#if defined(USE_OZONE)
+  VaapiVideoDecodeAccelerator(

[Ami GONE FROM CHROMIUM, 2014/04/18 22:40:25]

single-arg ctors need "explicit"

+      const base::Callback<bool(void)>& make_context_current); //NOLINT

[Ami GONE FROM CHROMIUM, 2014/04/18 22:40:25]

why NOLINT?

+#else
   VaapiVideoDecodeAccelerator(
       Display* x_display,
       const base::Callback<bool(void)>& make_context_current);
+#endif
   virtual ~VaapiVideoDecodeAccelerator();
 
   // media::VideoDecodeAccelerator implementation.
@@ -60,7 +69,7 @@ class CONTENT_EXPORT VaapiVideoDecodeAccelerator
   virtual void Reset() OVERRIDE;
   virtual void Destroy() OVERRIDE;
 
-private:
+ private:
   // Notify the client that an error has occurred and decoding cannot continue.
   void NotifyError(Error error);
 
@@ -148,11 +157,15 @@ private:
   // Check if the surfaces have been released or post ourselves for later.
   void TryFinishSurfaceSetChange();
 
+#if defined(USE_OZONE)
+  wl_display* wl_display_;
+  base::Callback<bool(void)> make_context_current_; //NOLINT

[Ami GONE FROM CHROMIUM, 2014/04/18 22:40:25]

why NOLINT?

[Ami GONE FROM CHROMIUM, 2014/04/18 22:40:25]

this is the same in the X11 case so why not just move it out of the conditional?

+#else
   // Client-provided X/GLX state.
   Display* x_display_;
   base::Callback<bool(void)> make_context_current_;
   GLXFBConfig fb_config_;
-
+#endif
   // VAVDA state.
   enum State {
     // Initialize() not called yet or failed.