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

media/gpu/avda_shared_state.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_SHARED_STATE_H_
 #define MEDIA_GPU_AVDA_SHARED_STATE_H_
 
 #include "base/synchronization/waitable_event.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/sdk_media_codec_bridge.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_surface.h"
 
-namespace gfx {
+namespace gl {
 class SurfaceTexture;
 }
 
 namespace media {
 
 class AVDACodecImage;
 class MediaCodecBridge;
 
 // Shared state to allow communication between the AVDA and the
 // GLImages that configure GL for drawing the frames.
@@ skipping 11 matching lines @@
     surface_texture_service_id_ = id;
   }
 
   // Signal the "frame available" event.  This may be called from any thread.
   void SignalFrameAvailable();
 
   void WaitForFrameAvailable();
 
   // Context that the surface texture is bound to, or nullptr if it is not in
   // the attached state.
-  gfx::GLContext* context() const { return context_.get(); }
+  gl::GLContext* context() const { return context_.get(); }
 
-  gfx::GLSurface* surface() const { return surface_.get(); }
+  gl::GLSurface* surface() const { return surface_.get(); }
 
   bool surface_texture_is_attached() const {
     return surface_texture_is_attached_;
   }
 
   // Iterates over all known codec images and updates the MediaCodec attached to
   // each one.
   void CodecChanged(media::MediaCodecBridge* codec);
 
   // Methods for finding and updating the AVDACodecImage associated with a given
@@ skipping 44 matching lines @@
   GLint surface_texture_service_id_;
 
   // For signalling OnFrameAvailable().
   base::WaitableEvent frame_available_event_;
 
   // True if and only if the surface texture is currently attached.
   bool surface_texture_is_attached_;
 
   // Context and surface that the surface texture is attached to, if it is
   // currently attached.
-  scoped_refptr<gfx::GLContext> context_;
-  scoped_refptr<gfx::GLSurface> surface_;
+  scoped_refptr<gl::GLContext> context_;
+  scoped_refptr<gl::GLSurface> surface_;
 
   // Maps a picture buffer id to a AVDACodecImage.
   std::map<int, AVDACodecImage*> codec_images_;
 
   // The time of the last call to RenderCodecBufferToSurfaceTexture(), null if
   // if there has been no last call or WaitForFrameAvailable() has been called
   // since the last call.
   base::TimeTicks release_time_;
 
   DISALLOW_COPY_AND_ASSIGN(AVDASharedState);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_AVDA_SHARED_STATE_H_