Ping watchdog thread during GpuChannel destruction

gpu/command_buffer/service/framebuffer_manager_unittest.cc

Index: gpu/command_buffer/service/framebuffer_manager_unittest.cc
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
index 3970f600b3e1fae1ed690be9583d47354d596fe7..ccaffec79c67778f87f27da10868ca8f1e8c771d 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -10,6 +10,7 @@
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
+#include "gpu/command_buffer/service/progress_reporter_stub.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "gpu/command_buffer/service/texture_manager.h"
@@ -41,14 +42,10 @@ class FramebufferManagerTest : public GpuServiceTest {
   FramebufferManagerTest()
       : manager_(1, 1, CONTEXT_TYPE_OPENGLES2, nullptr),
         feature_info_(new FeatureInfo()) {
-    texture_manager_.reset(new TextureManager(nullptr,
-                                              feature_info_.get(),
-                                              kMaxTextureSize,
-                                              kMaxCubemapSize,
-                                              kMaxRectangleTextureSize,
-                                              kMax3DTextureSize,
-                                              kMaxArrayTextureLayers,
-                                              kUseDefaultTextures));
+    texture_manager_.reset(new TextureManager(
+        nullptr, feature_info_.get(), kMaxTextureSize, kMaxCubemapSize,
+        kMaxRectangleTextureSize, kMax3DTextureSize, kMaxArrayTextureLayers,
+        kUseDefaultTextures, &progress_reporter_));
     renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
                                                         kMaxRenderbufferSize,
                                                         kMaxSamples,
@@ -65,6 +62,7 @@ class FramebufferManagerTest : public GpuServiceTest {
   scoped_refptr<FeatureInfo> feature_info_;
   std::unique_ptr<TextureManager> texture_manager_;
   std::unique_ptr<RenderbufferManager> renderbuffer_manager_;
+  ProgressReporterStub progress_reporter_;
 };
 
 TEST_F(FramebufferManagerTest, Basic) {
@@ -122,14 +120,10 @@ class FramebufferInfoTestBase : public GpuServiceTest {
                  context_type,
                  new FramebufferCompletenessCache),
         feature_info_(new FeatureInfo()) {
-    texture_manager_.reset(new TextureManager(nullptr,
-                                              feature_info_.get(),
-                                              kMaxTextureSize,
-                                              kMaxCubemapSize,
-                                              kMaxRectangleTextureSize,
-                                              kMax3DTextureSize,
-                                              kMaxArrayTextureLayers,
-                                              kUseDefaultTextures));
+    texture_manager_.reset(new TextureManager(
+        nullptr, feature_info_.get(), kMaxTextureSize, kMaxCubemapSize,
+        kMaxRectangleTextureSize, kMax3DTextureSize, kMaxArrayTextureLayers,
+        kUseDefaultTextures, &progress_reporter_));
     renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
                                                         kMaxRenderbufferSize,
                                                         kMaxSamples,
@@ -165,6 +159,7 @@ class FramebufferInfoTestBase : public GpuServiceTest {
   std::unique_ptr<RenderbufferManager> renderbuffer_manager_;
   std::unique_ptr<MockErrorState> error_state_;
   std::unique_ptr<MockGLES2Decoder> decoder_;
+  ProgressReporterStub progress_reporter_;
 };
 
 class FramebufferInfoTest : public FramebufferInfoTestBase {