Split out AVDA cleanups from SetSurface() change.

media/gpu/avda_codec_image.h

 // 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.
 
 #ifndef MEDIA_GPU_AVDA_CODEC_IMAGE_H_
 #define MEDIA_GPU_AVDA_CODEC_IMAGE_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gl_stream_texture_image.h"
 #include "media/gpu/avda_shared_state.h"
 
 namespace ui {
 class ScopedMakeCurrent;
 }
 
 namespace media {
 
 class VideoCodecBridge;
 
 // GLImage that renders MediaCodec buffers to a SurfaceTexture or SurfaceView as
 // needed in order to draw them.
 class AVDACodecImage : public gpu::gles2::GLStreamTextureImage {
  public:
-  AVDACodecImage(int picture_buffer_id,
-                 const scoped_refptr<AVDASharedState>& shared_state,
+  AVDACodecImage(const scoped_refptr<AVDASharedState>& shared_state,
                  VideoCodecBridge* codec,
                  const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder);
 
   // gl::GLImage implementation
   gfx::Size GetSize() override;
   unsigned GetInternalFormat() override;
   bool BindTexImage(unsigned target) override;
   void ReleaseTexImage(unsigned target) override;
   bool CopyTexImage(unsigned target) override;
   bool CopyTexSubImage(unsigned target,
@@ skipping 101 matching lines @@
   MediaCodecBridge* media_codec_;
 
   const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder_;
 
   // Indicates if we're rendering to a SurfaceTexture or not.
   const bool has_surface_texture_;
 
   // The texture that we're attached to.
   gpu::gles2::Texture* texture_;
 
-  // The picture buffer id attached to this image.
-  int picture_buffer_id_;
-
   DISALLOW_COPY_AND_ASSIGN(AVDACodecImage);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_AVDA_CODEC_IMAGE_H_