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

media/base/android/media_codec_player.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_MEDIA_CODEC_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_
 
 #include <memory>
 
 #include "base/android/scoped_java_ref.h"
@@ skipping 183 matching lines @@
       std::unique_ptr<DemuxerAndroid> demuxer,
       const GURL& frame_url,
       int media_session_id);
   ~MediaCodecPlayer() override;
 
   // A helper method that performs the media thread part of initialization.
   void Initialize();
 
   // MediaPlayerAndroid implementation.
   void DeleteOnCorrectThread() override;
-  void SetVideoSurface(gfx::ScopedJavaSurface surface) override;
+  void SetVideoSurface(gl::ScopedJavaSurface surface) override;
   void Start() override;
   void Pause(bool is_media_related_action) override;
   void SeekTo(base::TimeDelta timestamp) override;
   void Release() override;
   bool HasVideo() const override;
   bool HasAudio() const override;
   int GetVideoWidth() override;
   int GetVideoHeight() override;
   base::TimeDelta GetCurrentTime() override;
   base::TimeDelta GetDuration() override;
@@ skipping 160 matching lines @@
   base::TimeDelta duration_;
 
   // base::TickClock used by |interpolator_|.
   base::DefaultTickClock default_tick_clock_;
 
   // Tracks the most recent media time update and provides interpolated values
   // as playback progresses.
   TimeDeltaInterpolator interpolator_;
 
   // Pending data to be picked up by the upcoming state.
-  gfx::ScopedJavaSurface pending_surface_;
+  gl::ScopedJavaSurface pending_surface_;
   bool pending_start_;
   base::TimeDelta pending_seek_;
 
   // Data associated with a seek in progress.
   std::unique_ptr<SeekInfo> seek_info_;
 
   // Configuration data for the manager, accessed on the UI thread.
   MediaMetadata metadata_cache_;
 
   // Cached current time, accessed on UI thread.
@@ skipping 24 matching lines @@
   base::WeakPtr<MediaCodecPlayer> media_weak_this_;
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaCodecPlayer> media_weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCodecPlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_