Move code in ui/gl/* from gfx:: to gl::

media/gpu/android_deferred_rendering_backing_strategy.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_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_
 #define MEDIA_GPU_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_
 
 #include <stdint.h>
 #include <vector>
 
@@ skipping 22 matching lines @@
 // texture's front buffer rather than a copy.  To do this, it uses a GLImage
 // implementation to talk to MediaCodec.
 class MEDIA_GPU_EXPORT AndroidDeferredRenderingBackingStrategy
     : public AndroidVideoDecodeAccelerator::BackingStrategy {
  public:
   explicit AndroidDeferredRenderingBackingStrategy(
       AVDAStateProvider* state_provider);
   ~AndroidDeferredRenderingBackingStrategy() override;
 
   // AndroidVideoDecodeAccelerator::BackingStrategy
-  gfx::ScopedJavaSurface Initialize(int surface_view_id) override;
+  gl::ScopedJavaSurface Initialize(int surface_view_id) override;
   void Cleanup(
       bool have_context,
       const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers) override;
-  scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture() const override;
+  scoped_refptr<gl::SurfaceTexture> GetSurfaceTexture() const override;
   uint32_t GetTextureTarget() const override;
   gfx::Size GetPictureBufferSize() const override;
   void UseCodecBufferForPictureBuffer(
       int32_t codec_buffer_index,
       const media::PictureBuffer& picture_buffer) override;
   void AssignOnePictureBuffer(const media::PictureBuffer&, bool) override;
   void ReuseOnePictureBuffer(
       const media::PictureBuffer& picture_buffer) override;
   void MaybeRenderEarly() override;
   void CodecChanged(media::VideoCodecBridge* codec) override;
@@ skipping 26 matching lines @@
   // Return true if and only if CopySurfaceTextureToPictures is expected to work
   // on this device.
   bool ShouldCopyPictures() const;
 
   scoped_refptr<AVDASharedState> shared_state_;
 
   AVDAStateProvider* state_provider_;
 
   // The SurfaceTexture to render to. Non-null after Initialize() if
   // we're not rendering to a SurfaceView.
-  scoped_refptr<gfx::SurfaceTexture> surface_texture_;
+  scoped_refptr<gl::SurfaceTexture> surface_texture_;
 
   media::VideoCodecBridge* 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_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidDeferredRenderingBackingStrategy);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_