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

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 203 matching lines @@
   void ResetDecoder();
 
   const ContextGroup& group() const {
     return *group_.get();
   }
 
   void LoseContexts(error::ContextLostReason reason) const {
     group_->LoseContexts(reason);
   }
 
-  ::testing::StrictMock< ::gfx::MockGLInterface>* GetGLMock() const {
+  ::testing::StrictMock<::gl::MockGLInterface>* GetGLMock() const {
     return gl_.get();
   }
 
   GLES2Decoder* GetDecoder() const {
     return decoder_.get();
   }
 
   uint32_t GetAndClearBackbufferClearBitsForTest() const {
     return decoder_->GetAndClearBackbufferClearBitsForTest();
   }
@@ skipping 380 matching lines @@
   static const GLint kBadUniformIndex = 1000;
 
   static const GLint kOutputVariable1Size = 0;
   static const GLenum kOutputVariable1Type = GL_FLOAT_VEC4;
   static const GLuint kOutputVariable1ColorName = 7;
   static const GLuint kOutputVariable1Index = 0;
   static const char* kOutputVariable1Name;
   static const char* kOutputVariable1NameESSL3;
 
   // Use StrictMock to make 100% sure we know how GL will be called.
-  std::unique_ptr<::testing::StrictMock<::gfx::MockGLInterface>> gl_;
-  scoped_refptr<gfx::GLSurfaceStub> surface_;
+  std::unique_ptr<::testing::StrictMock<::gl::MockGLInterface>> gl_;
+  scoped_refptr<gl::GLSurfaceStub> surface_;
   scoped_refptr<GLContextMock> context_;
   std::unique_ptr<MockGLES2Decoder> mock_decoder_;
   std::unique_ptr<GLES2Decoder> decoder_;
   MemoryTracker* memory_tracker_;
 
   GLuint client_buffer_id_;
   GLuint client_framebuffer_id_;
   GLuint client_program_id_;
   GLuint client_renderbuffer_id_;
   GLuint client_sampler_id_;
@@ skipping 130 matching lines @@
 };
 
 // SpecializedSetup specializations that are needed in multiple unittest files.
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<cmds::LinkProgram, 0>(bool valid);
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_