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

gpu/command_buffer/service/program_manager_unittest.cc

 // 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.
 
 #include "gpu/command_buffer/service/program_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 2057 matching lines @@
         nullptr, 0, service_program_id);
   }
 
   void SetExpectationsForProgramLink() {
     SetExpectationsForProgramLink(kServiceProgramId);
   }
 
   void SetExpectationsForProgramLink(GLuint service_program_id) {
     TestHelper::SetupShaderExpectations(gl_.get(), feature_info_.get(), nullptr,
                                         0, nullptr, 0, service_program_id);
-    if (gfx::g_driver_gl.ext.b_GL_ARB_get_program_binary) {
+    if (gl::g_driver_gl.ext.b_GL_ARB_get_program_binary) {
       EXPECT_CALL(*gl_.get(),
                   ProgramParameteri(service_program_id,
                                     PROGRAM_BINARY_RETRIEVABLE_HINT,
                                     GL_TRUE)).Times(1);
     }
   }
 
   void SetExpectationsForSuccessCompile(
       const Shader* shader) {
     const GLuint shader_id = shader->service_id();
@@ skipping 255 matching lines @@
       {GL_FLOAT_VEC4, 0, GL_MEDIUM_FLOAT, true, "gl_SecondaryFragColorEXT",
        kVarOutput},
       {GL_FLOAT_VEC4, 0, GL_MEDIUM_FLOAT, true, "gl_FragColor", kVarOutput},
   };
 
   int shader_version = 100;
   Program* program =
       SetupProgramForVariables(nullptr, 0, kFragmentVaryings,
                                arraysize(kFragmentVaryings), &shader_version);
 
-  const gfx::GLVersionInfo& gl_version = feature_info_->gl_version_info();
+  const gl::GLVersionInfo& gl_version = feature_info_->gl_version_info();
   if (!gl_version.is_es) {
     // The call is expected only for OpenGL. OpenGL ES expects to
     // output GLES SL 1.00, which does not bind.
     EXPECT_CALL(*(gl_.get()),
                 BindFragDataLocationIndexed(kServiceProgramId, 0, 1,
                                             StrEq("angle_SecondaryFragColor")))
         .Times(1)
         .RetiresOnSaturation();
   }
 
   EXPECT_TRUE(LinkAsExpected(program, true));
 }
 
 TEST_P(ProgramManagerDualSourceBlendingES2Test, UseSecondaryFragData) {
   const VarInfo kFragmentVaryings[] = {
       {GL_FLOAT_VEC4, kMaxDualSourceDrawBuffers, GL_MEDIUM_FLOAT, true,
        "gl_SecondaryFragDataEXT", kVarOutput},
       {GL_FLOAT_VEC4, kMaxDrawBuffers, GL_MEDIUM_FLOAT, true, "gl_FragData",
        kVarOutput},
   };
 
   int shader_version = 100;
   Program* program =
       SetupProgramForVariables(nullptr, 0, kFragmentVaryings,
                                arraysize(kFragmentVaryings), &shader_version);
 
-  const gfx::GLVersionInfo& gl_version = feature_info_->gl_version_info();
+  const gl::GLVersionInfo& gl_version = feature_info_->gl_version_info();
   if (!gl_version.is_es) {
     // The call is expected only for OpenGL. OpenGL ES expects to
     // output GLES SL 1.00, which does not bind.
     EXPECT_CALL(*(gl_.get()),
                 BindFragDataLocationIndexed(kServiceProgramId, 0, 1,
                                             StrEq("angle_SecondaryFragData")))
         .Times(1)
         .RetiresOnSaturation();
   }
 
   EXPECT_TRUE(LinkAsExpected(program, true));
 }
 
 INSTANTIATE_TEST_CASE_P(
     SupportedContexts,
     ProgramManagerDualSourceBlendingES2Test,
     testing::Values(
         make_gl_ext_tuple("3.2",
                           "GL_ARB_draw_buffers GL_ARB_blend_func_extended "
                           "GL_ARB_program_interface_query"),
         make_gl_ext_tuple("opengl es 3.1",
                           "GL_EXT_draw_buffers GL_EXT_blend_func_extended")));
 
 }  // namespace gles2
 }  // namespace gpu