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

gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index 23652c1aa0e6e50aed27b10990ce8e6efdbe599e..ec7eb2b69b8ee682c20192672c6fb17d4fd1b107 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -33,7 +33,7 @@
 #define GL_DEPTH24_STENCIL8 0x88F0
 #endif
 
-using ::gfx::MockGLInterface;
+using ::gl::MockGLInterface;
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::DoAll;
@@ -606,7 +606,7 @@ const QueryType kQueryTypes[] = {
 const GLsync kGlSync = reinterpret_cast<GLsync>(0xdeadbeef);
 
 static void ExecuteGenerateQueryCmd(GLES2DecoderTestBase* test,
-                                    ::gfx::MockGLInterface* gl,
+                                    ::gl::MockGLInterface* gl,
                                     GLenum target,
                                     GLuint client_id,
                                     GLuint service_id) {
@@ -619,8 +619,8 @@ static void ExecuteGenerateQueryCmd(GLES2DecoderTestBase* test,
 }
 
 static error::Error ExecuteBeginQueryCmd(GLES2DecoderTestBase* test,
-                                         ::gfx::MockGLInterface* gl,
-                                         ::gfx::GPUTimingFake* timing_queries,
+                                         ::gl::MockGLInterface* gl,
+                                         ::gl::GPUTimingFake* timing_queries,
                                          GLenum target,
                                          GLuint client_id,
                                          GLuint service_id,
@@ -640,7 +640,7 @@ static error::Error ExecuteBeginQueryCmd(GLES2DecoderTestBase* test,
 }
 
 static error::Error ExecuteEndQueryCmd(GLES2DecoderTestBase* test,
-                                       ::gfx::MockGLInterface* gl,
+                                       ::gl::MockGLInterface* gl,
                                        GLenum target,
                                        uint32_t submit_count) {
   if (GL_ANY_SAMPLES_PASSED_EXT == target) {
@@ -668,8 +668,8 @@ static error::Error ExecuteEndQueryCmd(GLES2DecoderTestBase* test,
 }
 
 static error::Error ExecuteQueryCounterCmd(GLES2DecoderTestBase* test,
-                                           ::gfx::MockGLInterface* gl,
-                                           ::gfx::GPUTimingFake* timing_queries,
+                                           ::gl::MockGLInterface* gl,
+                                           ::gl::GPUTimingFake* timing_queries,
                                            GLenum target,
                                            GLuint client_id,
                                            GLuint service_id,
@@ -690,7 +690,7 @@ static error::Error ExecuteQueryCounterCmd(GLES2DecoderTestBase* test,
 }
 
 static bool ProcessQuery(GLES2DecoderTestBase* test,
-                         ::gfx::MockGLInterface* gl,
+                         ::gl::MockGLInterface* gl,
                          GLenum target,
                          GLuint service_id) {
   if (GL_ANY_SAMPLES_PASSED_EXT == target) {
@@ -733,8 +733,8 @@ static void CheckBeginEndQueryBadMemoryFails(GLES2DecoderTestBase* test,
   init.request_alpha = true;
   init.bind_generates_resource = true;
   test->InitDecoder(init);
-  ::testing::StrictMock< ::gfx::MockGLInterface>* gl = test->GetGLMock();
-  ::gfx::GPUTimingFake gpu_timing_queries;
+  ::testing::StrictMock<::gl::MockGLInterface>* gl = test->GetGLMock();
+  ::gl::GPUTimingFake gpu_timing_queries;
 
   ExecuteGenerateQueryCmd(test, gl, query_type.type,
                           client_id, service_id);
@@ -807,8 +807,8 @@ TEST_P(GLES2DecoderManualInitTest, QueryReuseTest) {
     init.request_alpha = true;
     init.bind_generates_resource = true;
     InitDecoder(init);
-    ::testing::StrictMock< ::gfx::MockGLInterface>* gl = GetGLMock();
-    ::gfx::GPUTimingFake gpu_timing_queries;
+    ::testing::StrictMock<::gl::MockGLInterface>* gl = GetGLMock();
+    ::gl::GPUTimingFake gpu_timing_queries;
 
     ExecuteGenerateQueryCmd(this, gl, query_type.type,
                             kNewClientId, kNewServiceId);