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

gpu/ipc/service/gpu_command_buffer_stub.h

 // Copyright (c) 2012 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_IPC_SERVICE_GPU_COMMAND_BUFFER_STUB_H_
 #define GPU_IPC_SERVICE_GPU_COMMAND_BUFFER_STUB_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 97 matching lines @@
   int32_t route_id() const { return route_id_; }
 
   // Identifies the stream for this command buffer.
   int32_t stream_id() const { return stream_id_; }
 
   // Sends a message to the console.
   void SendConsoleMessage(int32_t id, const std::string& message);
 
   void SendCachedShader(const std::string& key, const std::string& shader);
 
-  gfx::GLSurface* surface() const { return surface_.get(); }
+  gl::GLSurface* surface() const { return surface_.get(); }
 
   void AddDestructionObserver(DestructionObserver* observer);
   void RemoveDestructionObserver(DestructionObserver* observer);
 
   void SetLatencyInfoCallback(const LatencyInfoCallback& callback);
 
   void MarkContextLost();
 
   const gles2::FeatureInfo* GetFeatureInfo() const;
 
@@ skipping 94 matching lines @@
   bool use_virtualized_gl_context_;
   const CommandBufferId command_buffer_id_;
   const int32_t stream_id_;
   const int32_t route_id_;
   uint32_t last_flush_count_;
 
   std::unique_ptr<CommandBufferService> command_buffer_;
   std::unique_ptr<gles2::GLES2Decoder> decoder_;
   std::unique_ptr<CommandExecutor> executor_;
   std::unique_ptr<SyncPointClient> sync_point_client_;
-  scoped_refptr<gfx::GLSurface> surface_;
+  scoped_refptr<gl::GLSurface> surface_;
 
   base::ObserverList<DestructionObserver> destruction_observers_;
 
   bool waiting_for_sync_point_;
 
   base::TimeTicks process_delayed_work_time_;
   uint32_t previous_processed_num_;
   base::TimeTicks last_idle_time_;
 
   LatencyInfoCallback latency_info_callback_;
 
   GURL active_url_;
   size_t active_url_hash_;
 
   std::unique_ptr<WaitForCommandState> wait_for_token_;
   std::unique_ptr<WaitForCommandState> wait_for_get_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_IPC_SERVICE_GPU_COMMAND_BUFFER_STUB_H_