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

media/base/android/video_media_codec_decoder.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_BASE_ANDROID_VIDEO_MEDIA_CODEC_DECODER_H_
 #define MEDIA_BASE_ANDROID_VIDEO_MEDIA_CODEC_DECODER_H_
 
 #include <stddef.h>
 
 #include <set>
@@ skipping 33 matching lines @@
 
   const char* class_name() const override;
 
   bool HasStream() const override;
   void SetDemuxerConfigs(const DemuxerConfigs& configs) override;
   bool IsContentEncrypted() const override;
   void ReleaseDecoderResources() override;
   void ReleaseMediaCodec() override;
 
   // Stores the video surface to use with upcoming Configure()
-  void SetVideoSurface(gfx::ScopedJavaSurface surface);
+  void SetVideoSurface(gl::ScopedJavaSurface surface);
 
   // Returns true if there is a video surface to use.
   bool HasVideoSurface() const;
 
   // Sets whether protected surface is needed for the currently used DRM.
   void SetProtectedSurfaceRequired(bool value);
 
   // Returns true if  protected surface is needed.
   bool IsProtectedSurfaceRequired() const;
 
@@ skipping 26 matching lines @@
                            bool render,
                            bool update_time,
                            bool eos_encountered);
 
   // Data.
 
   // Configuration received from demuxer
   DemuxerConfigs configs_;
 
   // Video surface that we render to.
-  gfx::ScopedJavaSurface surface_;
+  gl::ScopedJavaSurface surface_;
 
   // Flags that indicates whether we need protected surface.
   bool is_protected_surface_required_;
 
   // Reports current playback time to the callee.
   SetTimeCallback update_current_time_cb_;
 
   // Informs the callee that video size is changed.
   VideoSizeChangedCallback video_size_changed_cb_;
 
   // Current video size to be sent with |video_size_changed_cb_|.
   gfx::Size video_size_;
 
   // Indices of output buffers that are posted for rendering.
   std::set<int> delayed_buffers_;
 
   // Associate presentation timestamps with time.
   base::TimeTicks start_time_ticks_;
   base::TimeDelta start_pts_;
 
   // Mantain the last seen PTS for stand-alone EOS.
   base::TimeDelta last_seen_pts_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoMediaCodecDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_VIDEO_MEDIA_CODEC_DECODER_H_