Added SurfaceTextureGLOwner to create / own GL objects.

media/gpu/avda_picture_buffer_manager.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_PICTURE_BUFFER_MANAGER_H_
 #define MEDIA_GPU_AVDA_PICTURE_BUFFER_MANAGER_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/macros.h"
 #include "media/gpu/avda_state_provider.h"
 #include "media/gpu/media_gpu_export.h"
+#include "media/gpu/surface_texture_gl_owner.h"
 
 namespace gpu {
 namespace gles2 {
 class GLStreamTextureImage;
 }
 }
 
 namespace gl {
 class ScopedJavaSurface;
 class SurfaceTexture;
@@ skipping 79 matching lines @@
                           gpu::gles2::GLStreamTextureImage* image);
 
   AVDACodecImage* GetImageForPicture(int picture_buffer_id) const;
 
   scoped_refptr<AVDASharedState> shared_state_;
 
   AVDAStateProvider* const state_provider_;
 
   // The SurfaceTexture to render to. Non-null after Initialize() if
   // we're not rendering to a SurfaceView.
-  scoped_refptr<gl::SurfaceTexture> surface_texture_;
+  scoped_refptr<SurfaceTextureGLOwner> surface_texture_;
 
   MediaCodecBridge* media_codec_;
 
   // Picture buffer IDs that are out for display. Stored in order of frames as
   // they are returned from the decoder.
   std::vector<int32_t> pictures_out_for_display_;
 
   // Maps a picture buffer id to a AVDACodecImage.
   std::map<int, scoped_refptr<AVDACodecImage>> codec_images_;
 
   DISALLOW_COPY_AND_ASSIGN(AVDAPictureBufferManager);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_AVDA_PICTURE_BUFFER_MANAGER_H_