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

gpu/command_buffer/service/query_manager_unittest.cc

Index: gpu/command_buffer/service/query_manager_unittest.cc
diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc
index 351f9b09d5b39dc071ddea56f7def083c2431792..0a6499726cc91e12889eeb873fde2fdf47dde0c4 100644
--- a/gpu/command_buffer/service/query_manager_unittest.cc
+++ b/gpu/command_buffer/service/query_manager_unittest.cc
@@ -669,9 +669,9 @@ TEST_F(QueryManagerTest, TimeElapsedQuery) {
   const GLuint kClient1Id = 1;
   const GLenum kTarget = GL_TIME_ELAPSED_EXT;
   const base::subtle::Atomic32 kSubmitCount = 123;
-  gfx::GPUTimingFake fake_timing_queries;
+  gl::GPUTimingFake fake_timing_queries;
   decoder_->GetGLContext()->CreateGPUTimingClient()->SetCpuTimeForTesting(
-      base::Bind(&gfx::GPUTimingFake::GetFakeCPUTime));
+      base::Bind(&gl::GPUTimingFake::GetFakeCPUTime));
 
   QueryManager::Query* query = manager_->CreateQuery(
       kTarget, kClient1Id, kSharedMemoryId, kSharedMemoryOffset);
@@ -701,9 +701,9 @@ TEST_F(QueryManagerTest, TimeElapsedPauseResume) {
   const GLuint kClient1Id = 1;
   const GLenum kTarget = GL_TIME_ELAPSED_EXT;
   const base::subtle::Atomic32 kSubmitCount = 123;
-  gfx::GPUTimingFake fake_timing_queries;
+  gl::GPUTimingFake fake_timing_queries;
   decoder_->GetGLContext()->CreateGPUTimingClient()->SetCpuTimeForTesting(
-      base::Bind(&gfx::GPUTimingFake::GetFakeCPUTime));
+      base::Bind(&gl::GPUTimingFake::GetFakeCPUTime));
 
   QueryManager::Query* query = manager_->CreateQuery(
       kTarget, kClient1Id, kSharedMemoryId, kSharedMemoryOffset);
@@ -757,7 +757,7 @@ TEST_F(QueryManagerTest, TimeElapsedPauseResume) {
 TEST_F(QueryManagerManualSetupTest, TimeElapsedDisjoint) {
   GpuServiceTest::SetUpWithGLVersion("OpenGL ES 3.0",
                                      "GL_EXT_disjoint_timer_query");
-  gfx::GPUTimingFake fake_timing_queries;
+  gl::GPUTimingFake fake_timing_queries;
   fake_timing_queries.ExpectDisjointCalls(*gl_);
   SetUpMockGL("GL_EXT_disjoint_timer_query");
 
@@ -806,10 +806,10 @@ TEST_F(QueryManagerTest, TimeStampQuery) {
   const GLuint kClient1Id = 1;
   const GLenum kTarget = GL_TIMESTAMP_EXT;
   const base::subtle::Atomic32 kSubmitCount = 123;
-  gfx::GPUTimingFake fake_timing_queries;
+  gl::GPUTimingFake fake_timing_queries;
 
   decoder_->GetGLContext()->CreateGPUTimingClient()->SetCpuTimeForTesting(
-      base::Bind(&gfx::GPUTimingFake::GetFakeCPUTime));
+      base::Bind(&gl::GPUTimingFake::GetFakeCPUTime));
 
   QueryManager::Query* query = manager_->CreateQuery(
       kTarget, kClient1Id, kSharedMemoryId, kSharedMemoryOffset);
@@ -832,7 +832,7 @@ TEST_F(QueryManagerTest, TimeStampQuery) {
 TEST_F(QueryManagerManualSetupTest, TimeStampDisjoint) {
   GpuServiceTest::SetUpWithGLVersion("OpenGL ES 3.0",
                                      "GL_EXT_disjoint_timer_query");
-  gfx::GPUTimingFake fake_timing_queries;
+  gl::GPUTimingFake fake_timing_queries;
   fake_timing_queries.ExpectDisjointCalls(*gl_);
   SetUpMockGL("GL_EXT_disjoint_timer_query");
 
@@ -878,7 +878,7 @@ TEST_F(QueryManagerManualSetupTest, TimeStampDisjoint) {
 TEST_F(QueryManagerManualSetupTest, DisjointContinualTest) {
   GpuServiceTest::SetUpWithGLVersion("OpenGL ES 3.0",
                                      "GL_EXT_disjoint_timer_query");
-  gfx::GPUTimingFake fake_timing_queries;
+  gl::GPUTimingFake fake_timing_queries;
   fake_timing_queries.ExpectDisjointCalls(*gl_);
   SetUpMockGL("GL_EXT_disjoint_timer_query");