Revert of Mac: Decode hardware to 420 instead of 422

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 d14b06a08a40048f51e46c0f40a02e633cce131f..c38feeb4a6b5d3ec084e591d0470069d80099de5 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.h
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.h
@@ -55,8 +55,9 @@
   class VaapiDecodeSurface;
 
   VaapiVideoDecodeAccelerator(
-      const MakeContextCurrentCallback& make_context_current,
-      const BindImageCallback& bind_image);
+      const base::Callback<bool(void)>& make_context_current,
+      const base::Callback<
+          void(uint32_t, uint32_t, scoped_refptr<gl::GLImage>)>& bind_image);
   ~VaapiVideoDecodeAccelerator() override;
 
   // media::VideoDecodeAccelerator implementation.
@@ -181,7 +182,7 @@
 
 
   // Client-provided GL state.
-  MakeContextCurrentCallback make_context_current_;
+  base::Callback<bool(void)> make_context_current_;
 
   // VAVDA state.
   enum State {
@@ -305,7 +306,8 @@
 
   // Binds the provided GLImage to a givenr client texture ID & texture target
   // combination in GLES.
-  BindImageCallback bind_image_;
+  base::Callback<void(uint32_t, uint32_t, scoped_refptr<gl::GLImage>)>
+      bind_image_;
 
   // The WeakPtrFactory for |weak_this_|.
   base::WeakPtrFactory<VaapiVideoDecodeAccelerator> weak_this_factory_;