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

gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
index f68f25375fba2f4d3b374f8a38572c69038777fe..7f02f8c70448fdffe310dec5320760c010dc042d 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
@@ -35,7 +35,7 @@
 #define GL_DEPTH24_STENCIL8 0x88F0
 #endif
 
-using ::gfx::MockGLInterface;
+using ::gl::MockGLInterface;
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::DoAll;
@@ -2983,11 +2983,11 @@ TEST_P(GLES2DecoderManualInitTest, InvalidateFramebufferBinding) {
 
   // EXPECT_EQ can't be used to compare function pointers
   EXPECT_TRUE(
-      gfx::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") !=
-      gfx::g_driver_gl.fn.glDiscardFramebufferEXTFn);
+      gl::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") !=
+      gl::g_driver_gl.fn.glDiscardFramebufferEXTFn);
   EXPECT_TRUE(
-      gfx::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") !=
-      gfx::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT"));
+      gl::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") !=
+      gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT"));
 }
 
 TEST_P(GLES2DecoderTest, ClearBackbufferBitsOnFlipSwap) {
@@ -3033,8 +3033,8 @@ TEST_P(GLES2DecoderManualInitTest, DiscardFramebufferEXT) {
 
   // EXPECT_EQ can't be used to compare function pointers
   EXPECT_TRUE(
-      gfx::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
-      gfx::g_driver_gl.fn.glDiscardFramebufferEXTFn);
+      gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
+      gl::g_driver_gl.fn.glDiscardFramebufferEXTFn);
 
   const GLenum target = GL_FRAMEBUFFER;
   const GLsizei count = 1;
@@ -3075,8 +3075,8 @@ TEST_P(GLES2DecoderManualInitTest, ClearBackbufferBitsOnDiscardFramebufferEXT) {
 
   // EXPECT_EQ can't be used to compare function pointers.
   EXPECT_TRUE(
-      gfx::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
-      gfx::g_driver_gl.fn.glDiscardFramebufferEXTFn);
+      gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
+      gl::g_driver_gl.fn.glDiscardFramebufferEXTFn);
 
   const GLenum target = GL_FRAMEBUFFER;
   const GLsizei count = 1;
@@ -3212,8 +3212,8 @@ TEST_P(GLES2DecoderManualInitTest,
   // Check that Discard GL_COLOR_ATTACHMENT0, sets the attachment as uncleared
   // and the framebuffer as incomplete.
   EXPECT_TRUE(
-      gfx::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
-      gfx::g_driver_gl.fn.glDiscardFramebufferEXTFn);
+      gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
+      gl::g_driver_gl.fn.glDiscardFramebufferEXTFn);
 
   const GLenum target = GL_FRAMEBUFFER;
   const GLsizei count = 1;