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

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 3d30266f05add7f81119ac0743c8f60e57bdbb87..8a3a8eb356f07e975cfc7ca37767a2065ff6ce44 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -468,10 +468,12 @@ void GpuVideoDecodeAccelerator::OnAssignPictureBuffers(
     buffers.push_back(media::PictureBuffer(buffer_ids[i], texture_dimensions_,
                                            service_ids, buffer_texture_ids));
   }
+  {
+    DebugAutoLock auto_lock(debug_uncleared_textures_lock_);
+    for (uint32_t i = 0; i < buffer_ids.size(); ++i)
+      uncleared_textures_[buffer_ids[i]] = textures[i];
+  }
   video_decode_accelerator_->AssignPictureBuffers(buffers);
-  DebugAutoLock auto_lock(debug_uncleared_textures_lock_);
-  for (uint32_t i = 0; i < buffer_ids.size(); ++i)
-    uncleared_textures_[buffer_ids[i]] = textures[i];
 }
 
 void GpuVideoDecodeAccelerator::OnReusePictureBuffer(