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

components/mus/surfaces/surfaces_context_provider.h

 // Copyright 2014 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 COMPONENTS_MUS_SURFACES_SURFACES_CONTEXT_PROVIDER_H_
 #define COMPONENTS_MUS_SURFACES_SURFACES_CONTEXT_PROVIDER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 40 matching lines @@
   class GrContext* GrContext() override;
   void InvalidateGrContext(uint32_t state) override;
   gpu::Capabilities ContextCapabilities() override;
   void DeleteCachedResources() override {}
   void SetLostContextCallback(
       const LostContextCallback& lost_context_callback) override;
   base::Lock* GetLock() override;
 
   // SurfacesContextProvider API.
   void SetSwapBuffersCompletionCallback(
-      gfx::GLSurface::SwapCompletionCallback callback);
+      gl::GLSurface::SwapCompletionCallback callback);
 
  protected:
   friend class base::RefCountedThreadSafe<SurfacesContextProvider>;
   ~SurfacesContextProvider() override;
 
  private:
   // CommandBufferLocalClient:
   void UpdateVSyncParameters(int64_t timebase, int64_t interval) override;
   void GpuCompletedSwapBuffers(gfx::SwapResult result) override;
 
   // From GLES2Context:
   // Initialized in BindToCurrentThread.
   std::unique_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
   std::unique_ptr<gpu::TransferBuffer> transfer_buffer_;
   std::unique_ptr<gpu::gles2::GLES2Implementation> implementation_;
 
   gpu::Capabilities capabilities_;
   LostContextCallback lost_context_callback_;
 
   SurfacesContextProviderDelegate* delegate_;
   gfx::AcceleratedWidget widget_;
   CommandBufferLocal* command_buffer_local_;
 
-  gfx::GLSurface::SwapCompletionCallback swap_buffers_completion_callback_;
+  gl::GLSurface::SwapCompletionCallback swap_buffers_completion_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfacesContextProvider);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_SURFACES_SURFACES_CONTEXT_PROVIDER_H_