Ping watchdog thread during GpuChannel destruction

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>
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/common_decoder.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/mocks.h"
+#include "gpu/command_buffer/service/progress_reporter_stub.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
 #include "ui/gl/gl_version_info.h"
 
 using ::testing::_;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::MatcherCast;
@@ skipping 42 matching lines @@
         gl_.get(), gl_extensions, "", gl_version, feature_info->context_type());
     feature_info->InitializeForTesting();
     feature_info_ = feature_info;
     SetupProgramManager();
   }
   void SetUp() override {
     // Parameters same as GpuServiceTest::SetUp
     SetUpBase("2.0", "GL_EXT_framebuffer_object");
   }
   void TearDown() override {
-    manager_->Destroy(false);
+    ProgressReporterStub progress_reporter;
+    manager_->Destroy(false, &progress_reporter);
     manager_.reset();
     feature_info_ = nullptr;
     GpuServiceTest::TearDown();
   }
 
   std::unique_ptr<ProgramManager> manager_;
   GpuPreferences gpu_preferences_;
   scoped_refptr<FeatureInfo> feature_info_;
 };
 
@@ skipping 20 matching lines @@
   const GLuint kService1Id = 11;
   // Check we can create program.
   Program* program0 = manager_->CreateProgram(kClient1Id, kService1Id);
   ASSERT_TRUE(program0 != NULL);
   // Check program got created.
   Program* program1 = manager_->GetProgram(kClient1Id);
   ASSERT_EQ(program0, program1);
   EXPECT_CALL(*gl_, DeleteProgram(kService1Id))
       .Times(1)
       .RetiresOnSaturation();
-  manager_->Destroy(true);
+  ProgressReporterStub progress_reporter;
+  manager_->Destroy(true, &progress_reporter);
   // Check the resources were released.
   program1 = manager_->GetProgram(kClient1Id);
   ASSERT_TRUE(program1 == NULL);
 }
 
 TEST_F(ProgramManagerTest, DeleteBug) {
   ShaderManager shader_manager;
   const GLuint kClient1Id = 1;
   const GLuint kClient2Id = 2;
   const GLuint kService1Id = 11;
@@ skipping 299 matching lines @@
     // Set up program
     Program* program =
         manager_->CreateProgram(kClientProgramId, kServiceProgramId);
     EXPECT_TRUE(program != NULL);
     EXPECT_TRUE(program->AttachShader(&shader_manager_, vshader));
     EXPECT_TRUE(program->AttachShader(&shader_manager_, fshader));
     return program;
   }
 
   void TearDown() override {
-    shader_manager_.Destroy(false);
+    ProgressReporterStub progress_reporter;
+    shader_manager_.Destroy(false, &progress_reporter);
     ProgramManagerTestBase::TearDown();
   }
 
   static AttribInfo kAttribs[];
   static UniformInfo kUniforms[];
   ShaderManager shader_manager_;
 };
 
 ProgramManagerWithShaderTest::AttribInfo
     ProgramManagerWithShaderTest::kAttribs[] = {
@@ skipping 1634 matching lines @@
     fragment_shader_->set_source("lka asjf a   fasgag 3rdsf3 bjajsdfj");
 
     program_ = manager_->CreateProgram(kClientProgramId, kServiceProgramId);
     ASSERT_TRUE(program_ != NULL);
 
     program_->AttachShader(&shader_manager_, vertex_shader_);
     program_->AttachShader(&shader_manager_, fragment_shader_);
   }
 
   void TearDown() override {
-    shader_manager_.Destroy(false);
+    ProgressReporterStub progress_reporter;
+    shader_manager_.Destroy(false, &progress_reporter);
     ProgramManagerTestBase::TearDown();
   }
 
   void SetShadersCompiled() {
     TestHelper::SetShaderStates(gl_.get(), vertex_shader_, true);
     TestHelper::SetShaderStates(gl_.get(), fragment_shader_, true);
   }
 
   void SetProgramCached() {
     cache_->LinkedProgramCacheSuccess(
@@ skipping 408 matching lines @@
     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