Ping watchdog thread during GpuChannel destruction

gpu/command_buffer/service/program_manager_unittest.cc

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 196c979c4d67f398d599e2c25cbfa2884f8d1ca5..f50d3064e355ba30daa98ad90f392f89d9e76db1 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -21,6 +21,7 @@
 #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"
@@ -59,12 +60,10 @@ uint32_t ComputeOffset(const void* start, const void* position) {
 class ProgramManagerTestBase : public GpuServiceTest {
  protected:
   virtual void SetupProgramManager() {
-    manager_.reset(new ProgramManager(nullptr, kMaxVaryingVectors,
-                                      kMaxDrawBuffers,
-                                      kMaxDualSourceDrawBuffers,
-                                      kMaxVertexAttribs,
-                                      gpu_preferences_,
-                                      feature_info_.get()));
+    manager_.reset(new ProgramManager(
+        nullptr, kMaxVaryingVectors, kMaxDrawBuffers, kMaxDualSourceDrawBuffers,
+        kMaxVertexAttribs, gpu_preferences_, feature_info_.get(),
+        &progress_reporter_));
   }
   void SetUpBase(const char* gl_version,
                  const char* gl_extensions,
@@ -92,6 +91,7 @@ class ProgramManagerTestBase : public GpuServiceTest {
   std::unique_ptr<ProgramManager> manager_;
   GpuPreferences gpu_preferences_;
   scoped_refptr<FeatureInfo> feature_info_;
+  ProgressReporterStub progress_reporter_;
 };
 
 class ProgramManagerTest : public ProgramManagerTestBase {};
@@ -131,7 +131,7 @@ TEST_F(ProgramManagerTest, Destroy) {
 }
 
 TEST_F(ProgramManagerTest, DeleteBug) {
-  ShaderManager shader_manager;
+  ShaderManager shader_manager(&progress_reporter_);
   const GLuint kClient1Id = 1;
   const GLuint kClient2Id = 2;
   const GLuint kService1Id = 11;
@@ -238,6 +238,8 @@ class ProgramManagerWithShaderTest : public ProgramManagerTestBase {
   static const size_t kNumAttribs;
   static const size_t kNumUniforms;
 
+  ProgramManagerWithShaderTest() : shader_manager_(&progress_reporter_) {}
+
  protected:
   typedef TestHelper::AttribInfo AttribInfo;
   typedef TestHelper::UniformInfo UniformInfo;
@@ -2066,17 +2068,15 @@ class ProgramManagerWithCacheTest : public ProgramManagerTestBase {
       : cache_(new MockProgramCache()),
         vertex_shader_(NULL),
         fragment_shader_(NULL),
-        program_(NULL) {
-  }
+        program_(NULL),
+        shader_manager_(&progress_reporter_) {}
 
  protected:
   void SetupProgramManager() override {
-    manager_.reset(new ProgramManager(cache_.get(), kMaxVaryingVectors,
-                                      kMaxDrawBuffers,
-                                      kMaxDualSourceDrawBuffers,
-                                      kMaxVertexAttribs,
-                                      gpu_preferences_,
-                                      feature_info_.get()));
+    manager_.reset(new ProgramManager(
+        cache_.get(), kMaxVaryingVectors, kMaxDrawBuffers,
+        kMaxDualSourceDrawBuffers, kMaxVertexAttribs, gpu_preferences_,
+        feature_info_.get(), &progress_reporter_));
   }
 
   void SetUp() override {
@@ -2248,6 +2248,7 @@ class ProgramManagerWithCacheTest : public ProgramManagerTestBase {
   Shader* fragment_shader_;
   Program* program_;
   ShaderManager shader_manager_;
+  ProgressReporterStub progress_reporter_;
 };
 
 // GCC requires these declarations, but MSVC requires they not be present