Ping watchdog thread during GpuChannel destruction

gpu/command_buffer/service/framebuffer_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 <stddef.h>
 #include <stdint.h>
 
 #include "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
 
 using ::testing::_;
 using ::testing::Return;
 
 namespace gpu {
@@ skipping 11 matching lines @@
 const uint32_t kMaxColorAttachments = 16;
 const bool kUseDefaultTextures = false;
 
 }  // namespace
 
 class FramebufferManagerTest : public GpuServiceTest {
  public:
   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,
                                                         feature_info_.get()));
   }
   ~FramebufferManagerTest() override {
     manager_.Destroy(false);
     texture_manager_->Destroy(false);
     renderbuffer_manager_->Destroy(false);
   }
 
  protected:
   FramebufferManager manager_;
   scoped_refptr<FeatureInfo> feature_info_;
   std::unique_ptr<TextureManager> texture_manager_;
   std::unique_ptr<RenderbufferManager> renderbuffer_manager_;
+  ProgressReporterStub progress_reporter_;
 };
 
 TEST_F(FramebufferManagerTest, Basic) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   const GLuint kClient2Id = 2;
   // Check we can create framebuffer.
   manager_.CreateFramebuffer(kClient1Id, kService1Id);
   // Check framebuffer got created.
   Framebuffer* framebuffer1 = manager_.GetFramebuffer(kClient1Id);
@@ skipping 37 matching lines @@
  public:
   static const GLuint kClient1Id = 1;
   static const GLuint kService1Id = 11;
 
   explicit FramebufferInfoTestBase(ContextType context_type)
       : manager_(kMaxDrawBuffers,
                  kMaxColorAttachments,
                  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,
                                                         feature_info_.get()));
   }
   ~FramebufferInfoTestBase() override {
     manager_.Destroy(false);
     texture_manager_->Destroy(false);
     renderbuffer_manager_->Destroy(false);
   }
@@ skipping 15 matching lines @@
     ASSERT_TRUE(framebuffer_ != nullptr);
   }
 
   FramebufferManager manager_;
   Framebuffer* framebuffer_;
   scoped_refptr<FeatureInfo> feature_info_;
   std::unique_ptr<TextureManager> texture_manager_;
   std::unique_ptr<RenderbufferManager> renderbuffer_manager_;
   std::unique_ptr<MockErrorState> error_state_;
   std::unique_ptr<MockGLES2Decoder> decoder_;
+  ProgressReporterStub progress_reporter_;
 };
 
 class FramebufferInfoTest : public FramebufferInfoTestBase {
  public:
   FramebufferInfoTest() : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES2) {}
 };
 
 // GCC requires these declarations, but MSVC requires they not be present
 #ifndef COMPILER_MSVC
 const GLuint FramebufferInfoTestBase::kClient1Id;
@@ skipping 1489 matching lines @@
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId);
   ASSERT_TRUE(renderbuffer != nullptr);
   framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer);
   EXPECT_TRUE(framebuffer_->GetReadBufferAttachment());
 }
 
 }  // namespace gles2
 }  // namespace gpu