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

gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 13 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::DoAll;
 using ::testing::InSequence;
 using ::testing::Invoke;
 using ::testing::MatcherCast;
 using ::testing::Mock;
 using ::testing::Pointee;
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::SetArrayArgument;
 using ::testing::SetArgumentPointee;
 using ::testing::SetArgPointee;
 using ::testing::StrEq;
 using ::testing::StrictMock;
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
-void SetupUpdateES3UnpackParametersExpectations(
-    ::gfx::MockGLInterface* gl,
-    GLint row_length,
-    GLint image_height) {
+void SetupUpdateES3UnpackParametersExpectations(::gl::MockGLInterface* gl,
+                                                GLint row_length,
+                                                GLint image_height) {
   EXPECT_CALL(*gl, PixelStorei(GL_UNPACK_ROW_LENGTH, row_length))
       .Times(1)
       .RetiresOnSaturation();
   EXPECT_CALL(*gl, PixelStorei(GL_UNPACK_IMAGE_HEIGHT, image_height))
       .Times(1)
       .RetiresOnSaturation();
 }
 
 }  // namespace anonymous
 
@@ skipping 422 matching lines @@
 // TODO(vmiura): Tests for ContextState::RestoreProgramBindings().
 
 // TODO(vmiura): Tests for ContextState::RestoreRenderbufferBindings().
 
 // TODO(vmiura): Tests for ContextState::RestoreProgramBindings().
 
 // TODO(vmiura): Tests for ContextState::RestoreGlobalState().
 
 }  // namespace gles2
 }  // namespace gpu