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

gpu/gles2_conform_support/egl/context.h

 // Copyright (c) 2011 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 GPU_GLES2_CONFORM_TEST_CONTEXT_H_
 #define GPU_GLES2_CONFORM_TEST_CONTEXT_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 66 matching lines @@
   uint64_t GenerateFenceSyncRelease() override;
   bool IsFenceSyncRelease(uint64_t release) override;
   bool IsFenceSyncFlushed(uint64_t release) override;
   bool IsFenceSyncFlushReceived(uint64_t release) override;
   void SignalSyncToken(const gpu::SyncToken& sync_token,
                        const base::Closure& callback) override;
   bool CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) override;
 
   // Called by ThreadState to set the needed global variables when this context
   // is current.
-  void ApplyCurrentContext(gfx::GLSurface* current_surface);
+  void ApplyCurrentContext(gl::GLSurface* current_surface);
   static void ApplyContextReleased();
 
  private:
   friend class base::RefCountedThreadSafe<Context>;
   ~Context() override;
-  bool CreateService(gfx::GLSurface* gl_surface);
+  bool CreateService(gl::GLSurface* gl_surface);
   void DestroyService();
   // Returns true if the object has GL service, either a working one or one
   // that has lost its GL context.
   bool HasService() const;
   void MarkServiceContextLost();
   bool WasServiceContextLost() const;
   bool IsCompatibleSurface(Surface* surface) const;
-  bool Flush(gfx::GLSurface* gl_surface);
+  bool Flush(gl::GLSurface* gl_surface);
 
   Display* display_;
   const Config* config_;
   bool is_current_in_some_thread_;
   bool is_destroyed_;
   gpu::GpuPreferences gpu_preferences_;
   const gpu::GpuDriverBugWorkarounds gpu_driver_bug_workarounds_;
   std::unique_ptr<gpu::CommandBufferService> command_buffer_;
   std::unique_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_;
   std::unique_ptr<gpu::gles2::GLES2Decoder> decoder_;
   std::unique_ptr<gpu::CommandExecutor> command_executor_;
   std::unique_ptr<gpu::TransferBuffer> transfer_buffer_;
 
-  scoped_refptr<gfx::GLContext> gl_context_;
+  scoped_refptr<gl::GLContext> gl_context_;
 
   std::unique_ptr<gpu::gles2::GLES2Interface> client_gl_context_;
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 }  // namespace egl
 
 #endif  // GPU_GLES2_CONFORM_TEST_CONTEXT_H_