Ping watchdog thread during GpuChannel destruction

gpu/command_buffer/service/texture_manager_unittest.cc

Index: gpu/command_buffer/service/texture_manager_unittest.cc
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
index 0236f718615a083ca4da6704b41abb855a004025..6e2bb165653214c6ddc14e063470bd96e489a9fd 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -97,7 +97,7 @@ class TextureManagerTest : public GpuServiceTest {
   }
 
   void TearDown() override {
-    manager_->Destroy(false);
+    manager_->Destroy(false, nullptr);
     manager_.reset();
     GpuServiceTest::TearDown();
   }
@@ -263,7 +263,7 @@ TEST_F(TextureManagerTest, UseDefaultTexturesTrue) {
 
   // TODO(vmiura): Test GL_TEXTURE_EXTERNAL_OES & GL_TEXTURE_RECTANGLE_ARB.
 
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureManagerTest, UseDefaultTexturesFalse) {
@@ -285,7 +285,7 @@ TEST_F(TextureManagerTest, UseDefaultTexturesFalse) {
 
   // TODO(vmiura): Test GL_TEXTURE_EXTERNAL_OES & GL_TEXTURE_RECTANGLE_ARB.
 
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureManagerTest, UseDefaultTexturesTrueES3) {
@@ -306,7 +306,7 @@ TEST_F(TextureManagerTest, UseDefaultTexturesTrueES3) {
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_3D) != NULL);
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D_ARRAY) != NULL);
 
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureManagerTest, UseDefaultTexturesFalseES3) {
@@ -327,7 +327,7 @@ TEST_F(TextureManagerTest, UseDefaultTexturesFalseES3) {
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_3D) == NULL);
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D_ARRAY) == NULL);
 
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureManagerTest, TextureUsageExt) {
@@ -355,7 +355,7 @@ TEST_F(TextureManagerTest, TextureUsageExt) {
       GL_TEXTURE_USAGE_ANGLE, GL_FRAMEBUFFER_ATTACHMENT_ANGLE, GL_NO_ERROR);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_ATTACHMENT_ANGLE),
             texture_ref->texture()->usage());
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureManagerTest, Destroy) {
@@ -382,7 +382,7 @@ TEST_F(TextureManagerTest, Destroy) {
       .RetiresOnSaturation();
   TestHelper::SetupTextureManagerDestructionExpectations(
       gl_.get(), false, false, "", kUseDefaultTextures);
-  manager.Destroy(true);
+  manager.Destroy(true, nullptr);
   // Check that resources got freed.
   texture = manager.GetTexture(kClient1Id);
   ASSERT_TRUE(texture == NULL);
@@ -538,7 +538,7 @@ TEST_F(TextureManagerTest, ValidForTargetNPOT) {
   EXPECT_TRUE(manager.ValidForTarget(GL_TEXTURE_2D, 1, 5, 2, 1));
   // Check NPOT height on level 1
   EXPECT_TRUE(manager.ValidForTarget(GL_TEXTURE_2D, 1, 2, 5, 1));
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureManagerTest, AlphaLuminanceCompatibilityProfile) {
@@ -740,7 +740,7 @@ class TextureTestBase : public GpuServiceTest {
       }
       texture_ref_ = NULL;
     }
-    manager_->Destroy(false);
+    manager_->Destroy(false, nullptr);
     manager_.reset();
     GpuServiceTest::TearDown();
   }
@@ -1043,7 +1043,7 @@ TEST_F(TextureTest, NPOT2DNPOTOK) {
   manager.MarkMipmapsGenerated(texture_ref);
   EXPECT_TRUE(TextureTestHelper::IsTextureComplete(texture));
   EXPECT_TRUE(manager.CanRender(texture_ref));
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureTest, POTCubeMap) {
@@ -1345,7 +1345,7 @@ TEST_F(TextureTest, FloatNotLinear) {
       gl_.get(), error_state_.get(), &manager, texture_ref,
       GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST, GL_NO_ERROR);
   EXPECT_TRUE(manager.CanRender(texture_ref));
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureTest, FloatLinear) {
@@ -1370,7 +1370,7 @@ TEST_F(TextureTest, FloatLinear) {
   manager.SetLevelInfo(texture_ref, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0,
                        GL_RGBA, GL_FLOAT, gfx::Rect(1, 1));
   EXPECT_TRUE(manager.CanRender(texture_ref));
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureTest, HalfFloatNotLinear) {
@@ -1403,7 +1403,7 @@ TEST_F(TextureTest, HalfFloatNotLinear) {
       gl_.get(), error_state_.get(), &manager, texture_ref,
       GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST, GL_NO_ERROR);
   EXPECT_TRUE(manager.CanRender(texture_ref));
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureTest, HalfFloatLinear) {
@@ -1428,7 +1428,7 @@ TEST_F(TextureTest, HalfFloatLinear) {
   manager.SetLevelInfo(texture_ref, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0,
                        GL_RGBA, GL_HALF_FLOAT_OES, gfx::Rect(1, 1));
   EXPECT_TRUE(manager.CanRender(texture_ref));
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureTest, EGLImageExternal) {
@@ -1451,7 +1451,7 @@ TEST_F(TextureTest, EGLImageExternal) {
   Texture* texture = texture_ref->texture();
   EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_EXTERNAL_OES), texture->target());
   EXPECT_FALSE(manager.CanGenerateMipmaps(texture_ref));
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureTest, DepthTexture) {
@@ -1474,7 +1474,7 @@ TEST_F(TextureTest, DepthTexture) {
   manager.SetLevelInfo(texture_ref, GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, 4, 4,
                        1, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, gfx::Rect());
   EXPECT_FALSE(manager.CanGenerateMipmaps(texture_ref));
-  manager.Destroy(false);
+  manager.Destroy(false, nullptr);
 }
 
 TEST_F(TextureTest, SafeUnsafe) {
@@ -2264,9 +2264,9 @@ class SharedTextureTest : public GpuServiceTest {
   }
 
   void TearDown() override {
-    texture_manager2_->Destroy(false);
+    texture_manager2_->Destroy(false, nullptr);
     texture_manager2_.reset();
-    texture_manager1_->Destroy(false);
+    texture_manager1_->Destroy(false, nullptr);
     texture_manager1_.reset();
     GpuServiceTest::TearDown();
   }