| Index: gpu/command_buffer/service/program_manager_unittest.cc
|
| diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
|
| index 5fcb3dcbb4db4f488c3b9e08ccfd2a7cb09307b1..ff913a5ab4e75d3a7c5885f14caedbd1382a0121 100644
|
| --- a/gpu/command_buffer/service/program_manager_unittest.cc
|
| +++ b/gpu/command_buffer/service/program_manager_unittest.cc
|
| @@ -2075,7 +2075,7 @@ class ProgramManagerWithCacheTest : public ProgramManagerTestBase {
|
| 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,
|
| @@ -2351,7 +2351,7 @@ TEST_P(ProgramManagerDualSourceBlendingES2Test, UseSecondaryFragCoord) {
|
| 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.
|
| @@ -2378,7 +2378,7 @@ TEST_P(ProgramManagerDualSourceBlendingES2Test, UseSecondaryFragData) {
|
| 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.
|
|
|