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

gpu/command_buffer/service/query_manager_unittest.cc

 // 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.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
@@ skipping 651 matching lines @@
   EXPECT_CALL(*gl_, DeleteQueries(1, ::testing::Pointee(kService1Id)))
       .Times(1)
       .RetiresOnSaturation();
   manager->Destroy(true);
 }
 
 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);
   ASSERT_TRUE(query != NULL);
 
   fake_timing_queries.ExpectGPUTimerQuery(*gl_, true);
   fake_timing_queries.SetCurrentGLTime(
       200 * base::Time::kNanosecondsPerMicrosecond);
   EXPECT_TRUE(manager_->BeginQuery(query));
   fake_timing_queries.SetCurrentGLTime(
       300 * base::Time::kNanosecondsPerMicrosecond);
   EXPECT_TRUE(manager_->EndQuery(query, kSubmitCount));
   EXPECT_TRUE(manager_->ProcessPendingQueries(false));
 
   EXPECT_TRUE(query->IsFinished());
 
   QuerySync* sync = decoder_->GetSharedMemoryAs<QuerySync*>(
       kSharedMemoryId, kSharedMemoryOffset, sizeof(*sync));
   const uint64_t expected_result =
       100u * base::Time::kNanosecondsPerMicrosecond;
   EXPECT_EQ(expected_result, sync->result);
 
   manager_->Destroy(false);
 }
 
 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);
   ASSERT_TRUE(query != NULL);
 
   fake_timing_queries.ExpectGPUTimerQuery(*gl_, true);
   fake_timing_queries.SetCurrentGLTime(
       200 * base::Time::kNanosecondsPerMicrosecond);
   EXPECT_TRUE(manager_->BeginQuery(query));
 
@@ skipping 33 matching lines @@
   const uint64_t expected_result2 =
       100u * base::Time::kNanosecondsPerMicrosecond;
   EXPECT_EQ(expected_result2, sync->result);
 
   manager_->Destroy(false);
 }
 
 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");
 
   DisjointValueSync* disjoint_sync =
       decoder_->GetSharedMemoryAs<DisjointValueSync*>(kSharedMemory2Id,
                                                       kSharedMemory2Offset,
                                                       sizeof(*disjoint_sync));
   manager_->SetDisjointSync(kSharedMemory2Id, kSharedMemory2Offset);
 
   const uint32_t current_disjoint_value = disjoint_sync->GetDisjointCount();
@@ skipping 28 matching lines @@
   EXPECT_TRUE(query->IsFinished());
   EXPECT_NE(current_disjoint_value, disjoint_sync->GetDisjointCount());
 
   manager_->Destroy(false);
 }
 
 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);
   ASSERT_TRUE(query != NULL);
 
   const uint64_t expected_result =
       100u * base::Time::kNanosecondsPerMicrosecond;
   fake_timing_queries.SetCurrentGLTime(expected_result);
   fake_timing_queries.ExpectGPUTimeStampQuery(*gl_, false);
   EXPECT_TRUE(manager_->QueryCounter(query, kSubmitCount));
   EXPECT_TRUE(manager_->ProcessPendingQueries(false));
 
   QuerySync* sync = decoder_->GetSharedMemoryAs<QuerySync*>(
       kSharedMemoryId, kSharedMemoryOffset, sizeof(*sync));
   EXPECT_EQ(expected_result, sync->result);
 
   manager_->Destroy(false);
 }
 
 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");
 
   DisjointValueSync* disjoint_sync =
       decoder_->GetSharedMemoryAs<DisjointValueSync*>(kSharedMemory2Id,
                                                       kSharedMemory2Offset,
                                                       sizeof(*disjoint_sync));
   manager_->SetDisjointSync(kSharedMemory2Id, kSharedMemory2Offset);
 
   const uint32_t current_disjoint_value = disjoint_sync->GetDisjointCount();
@@ skipping 25 matching lines @@
 
   EXPECT_TRUE(query->IsFinished());
   EXPECT_NE(current_disjoint_value, disjoint_sync->GetDisjointCount());
 
   manager_->Destroy(false);
 }
 
 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");
 
   DisjointValueSync* disjoint_sync =
       decoder_->GetSharedMemoryAs<DisjointValueSync*>(kSharedMemory2Id,
                                                       kSharedMemory2Offset,
                                                       sizeof(*disjoint_sync));
   manager_->SetDisjointSync(kSharedMemory2Id, kSharedMemory2Offset);
 
   const uint32_t current_disjoint_value = disjoint_sync->GetDisjointCount();
@@ skipping 59 matching lines @@
 
   EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result);
 
   manager->Destroy(false);
 }
 
 }  // namespace gles2
 }  // namespace gpu