| Index: gpu/command_buffer/service/texture_manager_unittest.cc
|
| diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
|
| index 476222672ace590cd35e28cf16dc94b3de0515ff..4d99d7ca5c8da7dc7593d9f187bf16bddb05afb3 100644
|
| --- a/gpu/command_buffer/service/texture_manager_unittest.cc
|
| +++ b/gpu/command_buffer/service/texture_manager_unittest.cc
|
| @@ -109,9 +109,11 @@ class TextureManagerTest : public GpuServiceTest {
|
| const char* gl_version,
|
| bool enable_es3) {
|
| TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
|
| - gl_.get(), gl_extensions, "", gl_version,
|
| - feature_info_->context_type(), enable_es3);
|
| - feature_info_->InitializeForTesting();
|
| + gl_.get(), gl_extensions, "", gl_version, enable_es3);
|
| + if (enable_es3)
|
| + feature_info_->InitializeForTesting(CONTEXT_TYPE_OPENGLES3);
|
| + else
|
| + feature_info_->InitializeForTesting();
|
| if (enable_es3) {
|
| EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _))
|
| .WillOnce(SetArgPointee<1>(8))
|
| @@ -2202,8 +2204,7 @@ class SharedTextureTest : public GpuServiceTest {
|
| const char* gl_version,
|
| bool enable_es3) {
|
| TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
|
| - gl_.get(), gl_extensions, "", gl_version,
|
| - feature_info_->context_type(), enable_es3);
|
| + gl_.get(), gl_extensions, "", gl_version, enable_es3);
|
| feature_info_->InitializeForTesting();
|
| if (enable_es3) {
|
| EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _))
|
|
|