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

media/gpu/avda_shared_state.cc

 // 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.
 
 #include "media/gpu/avda_shared_state.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
 #include "media/gpu/avda_codec_image.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 36 matching lines @@
   if (!frame_available_event_.TimedWait(remaining)) {
     DVLOG(1) << "WaitForFrameAvailable() timed out, elapsed: "
              << elapsed.InMillisecondsF()
              << "ms, additionally waited: " << remaining.InMillisecondsF()
              << "ms, total: " << (elapsed + remaining).InMillisecondsF()
              << "ms";
   }
 }
 
 void AVDASharedState::DidAttachSurfaceTexture() {
-  context_ = gfx::GLContext::GetCurrent();
-  surface_ = gfx::GLSurface::GetCurrent();
+  context_ = gl::GLContext::GetCurrent();
+  surface_ = gl::GLSurface::GetCurrent();
   DCHECK(context_);
   DCHECK(surface_);
 
   surface_texture_is_attached_ = true;
 }
 
 void AVDASharedState::CodecChanged(media::MediaCodecBridge* codec) {
   for (auto& image_kv : codec_images_)
     image_kv.second->CodecChanged(codec);
   release_time_ = base::TimeTicks();
@@ skipping 20 matching lines @@
 void AVDASharedState::RenderCodecBufferToSurfaceTexture(
     media::MediaCodecBridge* codec,
     int codec_buffer_index) {
   if (!release_time_.is_null())
     WaitForFrameAvailable();
   codec->ReleaseOutputBuffer(codec_buffer_index, true);
   release_time_ = base::TimeTicks::Now();
 }
 
 }  // namespace media