Add SurfaceTexture::release and call it from AVDA.

media/gpu/android_copying_backing_strategy.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/gpu/android_copying_backing_strategy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "gpu/command_buffer/service/context_group.h"
@@ skipping 21 matching lines @@
     LOG(ERROR) << "The copying strategy should not be initialized with a "
                   "surface id.";
     return gl::ScopedJavaSurface();
   }
 
   surface_texture_ =
       state_provider_->CreateAttachedSurfaceTexture(&surface_texture_id_);
   return gl::ScopedJavaSurface(surface_texture_.get());
 }
 
-void AndroidCopyingBackingStrategy::Cleanup(
+void AndroidCopyingBackingStrategy::BeginCleanup(
     bool have_context,
     const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers) {
   DCHECK(state_provider_->ThreadChecker().CalledOnValidThread());
 
   if (copier_)
     copier_->Destroy();
 
   if (surface_texture_id_ && have_context)
     glDeleteTextures(1, &surface_texture_id_);
 }
 
+void AndroidCopyingBackingStrategy::EndCleanup() {}
+
 scoped_refptr<gl::SurfaceTexture>
 AndroidCopyingBackingStrategy::GetSurfaceTexture() const {
   return surface_texture_;
 }
 
 uint32_t AndroidCopyingBackingStrategy::GetTextureTarget() const {
   return GL_TEXTURE_2D;
 }
 
 gfx::Size AndroidCopyingBackingStrategy::GetPictureBufferSize() const {
@@ skipping 104 matching lines @@
   RETURN_IF_NULL(texture_ref);
   gpu::gles2::TextureManager* texture_manager =
       state_provider_->GetGlDecoder()->GetContextGroup()->texture_manager();
   RETURN_IF_NULL(texture_manager);
   texture_manager->SetLevelInfo(texture_ref, GetTextureTarget(), 0, GL_RGBA,
                                 new_size.width(), new_size.height(), 1, 0,
                                 GL_RGBA, GL_UNSIGNED_BYTE, gfx::Rect(new_size));
 }
 
 }  // namespace media