 +#include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
 +#include "ui/gl/gl_implementation.h"
  #elif defined(OS_ANDROID)
+ #include "content/common/gpu/media/android_copying_backing_strategy.h"
  #include "content/common/gpu/media/android_video_decode_accelerator.h"
- #endif
-@@ -346,7 +347,7 @@ void GpuVideoDecodeAccelerator::BindImage(uint32 client_texture_id,
+@@ -347,7 +348,7 @@ void GpuVideoDecodeAccelerator::BindImage(uint32 client_texture_id,
  scoped_ptr<media::VideoDecodeAccelerator>
  GpuVideoDecodeAccelerator::CreateVaapiVDA() {
    scoped_ptr<media::VideoDecodeAccelerator> decoder;

   decoder.reset(new VaapiVideoDecodeAccelerator(
       make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage,
                                         base::Unretained(this))));
@@ -366,11 +367,6 @@ GpuVideoDecodeAccelerator::CreateVTVDA() {
 scoped_ptr<media::VideoDecodeAccelerator>
 GpuVideoDecodeAccelerator::CreateOzoneVDA() {
   scoped_ptr<media::VideoDecodeAccelerator> decoder;

 const char kLibsecretFieldTrialDisabledGroupName[] = "Disabled";
 #endif
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
index 5205404..87b8a94 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -44,7 +44,8 @@
