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

media/gpu/dxva_picture_buffer_win.h

 // Copyright 2016 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_DXVA_PICTURE_BUFFER_WIN_H_
 #define MEDIA_GPU_DXVA_PICTURE_BUFFER_WIN_H_
 
 #include <d3d11.h>
 #include <d3d9.h>
 #include <mfidl.h>
@@ skipping 35 matching lines @@
 
   bool available() const { return available_; }
 
   void set_available(bool available) { available_ = available; }
 
   int id() const { return picture_buffer_.id(); }
 
   gfx::Size size() const { return picture_buffer_.size(); }
 
   virtual bool waiting_to_reuse() const;
-  virtual gfx::GLFence* reuse_fence();
+  virtual gl::GLFence* reuse_fence();
 
   // Called when the source surface |src_surface| is copied to the destination
   // |dest_surface|
   virtual bool CopySurfaceComplete(IDirect3DSurface9* src_surface,
                                    IDirect3DSurface9* dest_surface);
   virtual bool BindSampleToTexture(base::win::ScopedComPtr<IMFSample> sample);
 
  protected:
   explicit DXVAPictureBuffer(const media::PictureBuffer& buffer);
 
@@ skipping 14 matching lines @@
   bool InitializeTexture(const DXVAVideoDecodeAccelerator& decoder,
                          bool use_rgb);
 
   bool ReusePictureBuffer() override;
   void ResetReuseFence() override;
   bool CopyOutputSampleDataToPictureBuffer(DXVAVideoDecodeAccelerator* decoder,
                                            IDirect3DSurface9* dest_surface,
                                            ID3D11Texture2D* dx11_texture,
                                            int input_buffer_id) override;
   bool waiting_to_reuse() const override;
-  gfx::GLFence* reuse_fence() override;
+  gl::GLFence* reuse_fence() override;
   bool CopySurfaceComplete(IDirect3DSurface9* src_surface,
                            IDirect3DSurface9* dest_surface) override;
 
  protected:
   // This is true if the decoder is currently waiting on the fence before
   // reusing the buffer.
   bool waiting_to_reuse_;
   EGLSurface decoding_surface_;
 
-  std::unique_ptr<gfx::GLFence> reuse_fence_;
+  std::unique_ptr<gl::GLFence> reuse_fence_;
 
   HANDLE texture_share_handle_;
   base::win::ScopedComPtr<IDirect3DTexture9> decoding_texture_;
   base::win::ScopedComPtr<ID3D11Texture2D> dx11_decoding_texture_;
 
   base::win::ScopedComPtr<IDXGIKeyedMutex> egl_keyed_mutex_;
   base::win::ScopedComPtr<IDXGIKeyedMutex> dx11_keyed_mutex_;
 
   // This is the last value that was used to release the keyed mutex.
   uint64_t keyed_mutex_value_;
@@ skipping 28 matching lines @@
  private:
   EGLStreamKHR stream_;
 
   base::win::ScopedComPtr<IMFSample> current_d3d_sample_;
   base::win::ScopedComPtr<ID3D11Texture2D> dx11_decoding_texture_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_DXVA_PICTURE_BUFFER_WIN_H_