| Index: gpu/command_buffer/service/query_manager_unittest.cc
|
| diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc
|
| index 8f61ff22bd606af859e2ab3bfcc4e5985b91917d..dfe901133588a9aa1023eb47d649a016b6897027 100644
|
| --- a/gpu/command_buffer/service/query_manager_unittest.cc
|
| +++ b/gpu/command_buffer/service/query_manager_unittest.cc
|
| @@ -46,6 +46,7 @@ class QueryManagerTest : public GpuServiceTest {
|
|
|
| protected:
|
| void SetUp() override {
|
| + GpuDriverBugWorkarounds::Initialize(gpu_driver_bug_workarounds_);
|
| GpuServiceTest::SetUpWithGLVersion("3.2",
|
| "GL_ARB_occlusion_query, "
|
| "GL_ARB_timer_query");
|
| @@ -68,7 +69,8 @@ class QueryManagerTest : public GpuServiceTest {
|
| gl_.get(), extension_expectations);
|
| EXPECT_CALL(*decoder_.get(), GetGLContext())
|
| .WillRepeatedly(Return(GetGLContext()));
|
| - scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
|
| + scoped_refptr<FeatureInfo> feature_info(
|
| + new FeatureInfo(gpu_driver_bug_workarounds_));
|
| feature_info->InitializeForTesting();
|
| manager_.reset(new QueryManager(decoder_.get(), feature_info.get()));
|
| }
|
| @@ -508,7 +510,8 @@ TEST_F(QueryManagerTest, ARBOcclusionQuery2) {
|
| TestHelper::SetupFeatureInfoInitExpectations(
|
| gl_.get(),
|
| "GL_ARB_occlusion_query2");
|
| - scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
|
| + scoped_refptr<FeatureInfo> feature_info(
|
| + new FeatureInfo(gpu_driver_bug_workarounds_));
|
| feature_info->InitializeForTesting();
|
| scoped_ptr<QueryManager> manager(
|
| new QueryManager(decoder_.get(), feature_info.get()));
|
| @@ -542,7 +545,8 @@ TEST_F(QueryManagerTest, ARBOcclusionQuery) {
|
| TestHelper::SetupFeatureInfoInitExpectations(
|
| gl_.get(),
|
| "GL_ARB_occlusion_query");
|
| - scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
|
| + scoped_refptr<FeatureInfo> feature_info(
|
| + new FeatureInfo(gpu_driver_bug_workarounds_));
|
| feature_info->InitializeForTesting();
|
| scoped_ptr<QueryManager> manager(
|
| new QueryManager(decoder_.get(), feature_info.get()));
|
| @@ -575,7 +579,8 @@ TEST_F(QueryManagerTest, ARBOcclusionPauseResume) {
|
| TestHelper::SetupFeatureInfoInitExpectations(
|
| gl_.get(),
|
| "GL_ARB_occlusion_query");
|
| - scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
|
| + scoped_refptr<FeatureInfo> feature_info(
|
| + new FeatureInfo(gpu_driver_bug_workarounds_));
|
| feature_info->InitializeForTesting();
|
| scoped_ptr<QueryManager> manager(
|
| new QueryManager(decoder_.get(), feature_info.get()));
|
| @@ -918,7 +923,9 @@ TEST_F(QueryManagerTest, GetErrorQuery) {
|
| const base::subtle::Atomic32 kSubmitCount = 123;
|
|
|
| TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), "");
|
| - scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
|
| + scoped_refptr<FeatureInfo> feature_info(
|
| + new FeatureInfo(gpu_driver_bug_workarounds_));
|
| +
|
| feature_info->InitializeForTesting();
|
| scoped_ptr<QueryManager> manager(
|
| new QueryManager(decoder_.get(), feature_info.get()));
|
|
|