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

gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc

 // Copyright 2014 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 "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 17 matching lines @@
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_mock.h"
 #include "ui/gl/gl_surface_stub.h"
 
 #if !defined(GL_DEPTH24_STENCIL8)
 #define GL_DEPTH24_STENCIL8 0x88F0
 #endif
 
-using ::gfx::MockGLInterface;
+using ::gl::MockGLInterface;
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::Invoke;
 using ::testing::MatcherCast;
 using ::testing::Mock;
 using ::testing::Pointee;
 using ::testing::Return;
 using ::testing::SaveArg;
@@ skipping 2927 matching lines @@
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_P(GLES2DecoderManualInitTest, InvalidateFramebufferBinding) {
   InitState init;
   init.gl_version = "opengl es 3.0";
   InitDecoder(init);
 
   // 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) {
   surface_->set_buffers_flipped(true);
 
   EXPECT_EQ(0u, GetAndClearBackbufferClearBitsForTest());
 
   SwapBuffers& cmd = *GetImmediateAs<SwapBuffers>();
   cmd.Init();
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ skipping 25 matching lines @@
 }
 
 TEST_P(GLES2DecoderManualInitTest, DiscardFramebufferEXT) {
   InitState init;
   init.extensions = "GL_EXT_discard_framebuffer";
   init.gl_version = "opengl es 2.0";
   InitDecoder(init);
 
   // 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;
   const GLenum attachments[] = {GL_COLOR_ATTACHMENT0};
 
   SetupTexture();
   DoBindFramebuffer(
       GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
   DoFramebufferTexture2D(GL_FRAMEBUFFER,
                          GL_COLOR_ATTACHMENT0,
@@ skipping 20 matching lines @@
 }
 
 TEST_P(GLES2DecoderManualInitTest, ClearBackbufferBitsOnDiscardFramebufferEXT) {
   InitState init;
   init.extensions = "GL_EXT_discard_framebuffer";
   init.gl_version = "opengl es 2.0";
   InitDecoder(init);
 
   // 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;
   GLenum attachments[] = {GL_COLOR_EXT};
 
   EXPECT_CALL(*gl_, DiscardFramebufferEXT(target, count, _))
       .Times(1)
       .RetiresOnSaturation();
   DiscardFramebufferEXTImmediate& cmd =
       *GetImmediateAs<DiscardFramebufferEXTImmediate>();
@@ skipping 115 matching lines @@
   // Check that framebuffer is cleared and complete.
   FramebufferManager* framebuffer_manager = group().framebuffer_manager();
   Framebuffer* framebuffer =
       framebuffer_manager->GetFramebuffer(client_framebuffer_id_);
   EXPECT_TRUE(framebuffer->IsCleared());
   EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
 
   // 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;
   const GLenum attachments[] = {GL_COLOR_ATTACHMENT0};
 
   DiscardFramebufferEXTImmediate& discard_cmd =
       *GetImmediateAs<DiscardFramebufferEXTImmediate>();
   discard_cmd.Init(target, count, attachments);
 
   EXPECT_CALL(*gl_, DiscardFramebufferEXT(target, count, _))
@@ skipping 98 matching lines @@
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 // TODO(gman): PixelStorei
 
 // TODO(gman): SwapBuffers
 
 }  // namespace gles2
 }  // namespace gpu