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

gpu/command_buffer/service/query_manager.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_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_
 
 #include <stdint.h>
 
 #include <deque>
 #include <memory>
 #include <vector>
 
 #include "base/atomicops.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/gpu_export.h"
 
-namespace gfx {
-  class GPUTimer;
-  class GPUTimingClient;
+namespace gl {
+class GPUTimer;
+class GPUTimingClient;
 }
 
 namespace gpu {
 
 class GLES2Decoder;
 
 namespace gles2 {
 
 class FeatureInfo;
 
@@ skipping 220 matching lines @@
   // True if there are pending transfer queries.
   bool HavePendingTransferQueries();
 
   // Do any updates we need to do when the frame has begun.
   void ProcessFrameBeginUpdates();
 
   GLES2Decoder* decoder() const {
     return decoder_;
   }
 
-  std::unique_ptr<gfx::GPUTimer> CreateGPUTimer(bool elapsed_time);
+  std::unique_ptr<gl::GPUTimer> CreateGPUTimer(bool elapsed_time);
   bool GPUTimingAvailable();
 
   void GenQueries(GLsizei n, const GLuint* queries);
   bool IsValidQuery(GLuint id);
 
  private:
   void StartTracking(Query* query);
   void StopTracking(Query* query);
 
   // Wrappers for BeginQueryARB and EndQueryARB to hide differences between
@@ skipping 55 matching lines @@
   typedef std::map<GLenum, scoped_refptr<Query> > ActiveQueryMap;
   ActiveQueryMap active_queries_;
 
   // Queries waiting for completion.
   typedef std::deque<scoped_refptr<Query> > QueryQueue;
   QueryQueue pending_queries_;
 
   // Async pixel transfer queries waiting for completion.
   QueryQueue pending_transfer_queries_;
 
-  scoped_refptr<gfx::GPUTimingClient> gpu_timing_client_;
+  scoped_refptr<gl::GPUTimingClient> gpu_timing_client_;
 
   DISALLOW_COPY_AND_ASSIGN(QueryManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_