Chromium Code Reviews| 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 e9840e97a5512d63ccecf3d215e3504e6cca4767..b37384f6964bce9ffd90fe380b0503d0dd7ac73a 100644 |
| --- a/gpu/command_buffer/service/program_manager_unittest.cc |
| +++ b/gpu/command_buffer/service/program_manager_unittest.cc |
| @@ -70,8 +70,12 @@ class ProgramManagerTestBase : public GpuServiceTest { |
| const char* gl_extensions, |
| FeatureInfo* feature_info = nullptr) { |
| GpuServiceTest::SetUpWithGLVersion(gl_version, gl_extensions); |
| + ContextType context_type = CONTEXT_TYPE_OPENGLES2; |
| + if (feature_info) { |
|
Zhenyao Mo
2016/08/31 00:15:19
nit: You can move if (!feature_info) feature_info
Kai Ninomiya
2016/08/31 00:47:59
Done (not yet uploaded).
|
| + context_type = feature_info->context_type(); |
| + } |
| TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion( |
| - gl_.get(), gl_extensions, "", gl_version); |
| + gl_.get(), gl_extensions, "", gl_version, context_type); |
| if (!feature_info) |
| feature_info = new FeatureInfo(); |
| feature_info->InitializeForTesting(); |