Merge to M51: Various fixes to prevent playback hang on MotoX.

content/common/gpu/media/android_copying_backing_strategy.h

Index: content/common/gpu/media/android_copying_backing_strategy.h
diff --git a/content/common/gpu/media/android_copying_backing_strategy.h b/content/common/gpu/media/android_copying_backing_strategy.h
index 8980404dfdb48283fb300311065516ab4f25eed6..01f0205415408dfe71b4a6a7080ddf6a15dfcadd 100644
--- a/content/common/gpu/media/android_copying_backing_strategy.h
+++ b/content/common/gpu/media/android_copying_backing_strategy.h
@@ -33,16 +33,16 @@ class CONTENT_EXPORT AndroidCopyingBackingStrategy
 
   // AndroidVideoDecodeAccelerator::BackingStrategy
   gfx::ScopedJavaSurface Initialize(int surface_view_id) override;
-  void Cleanup(bool have_context,
-               const AndroidVideoDecodeAccelerator::OutputBufferMap&) override;
+  void Cleanup(
+      bool have_context,
+      const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers) override;
   scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture() const override;
   uint32_t GetTextureTarget() const override;
   gfx::Size GetPictureBufferSize() const override;
-  void UseCodecBufferForPictureBuffer(int32_t codec_buffer_index,
-                                      const media::PictureBuffer&) override;
-  void CodecChanged(
-      media::VideoCodecBridge*,
-      const AndroidVideoDecodeAccelerator::OutputBufferMap&) override;
+  void UseCodecBufferForPictureBuffer(
+      int32_t codec_buffer_index,
+      const media::PictureBuffer& picture_buffer) override;
+  void CodecChanged(media::VideoCodecBridge* codec) override;
   void OnFrameAvailable() override;
   bool ArePicturesOverlayable() override;
   void UpdatePictureBufferSize(media::PictureBuffer* picture_buffer,