Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: gpu/command_buffer/service/shader_manager_unittest.cc

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: revert to passing via destructor Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/shader_manager_unittest.cc
diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc
index 1aef056902255d88f1b2915e5236bb83dcd0b7a3..3726d9ba1ea9f98d7614e71d4e936d29136e76fe 100644
--- a/gpu/command_buffer/service/shader_manager_unittest.cc
+++ b/gpu/command_buffer/service/shader_manager_unittest.cc
@@ -6,6 +6,7 @@
#include "gpu/command_buffer/service/gpu_service_test.h"
#include "gpu/command_buffer/service/mocks.h"
+#include "gpu/command_buffer/service/progress_reporter_stub.h"
#include "gpu/command_buffer/service/test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gl/gl_mock.h"
@@ -21,7 +22,10 @@ class ShaderManagerTest : public GpuServiceTest {
ShaderManagerTest() {
}
- ~ShaderManagerTest() override { manager_.Destroy(false); }
+ ~ShaderManagerTest() override {
+ ProgressReporterStub progress_reporter;
+ manager_.Destroy(false, &progress_reporter);
+ }
protected:
ShaderManager manager_;
@@ -61,7 +65,8 @@ TEST_F(ShaderManagerTest, Destroy) {
EXPECT_CALL(*gl_, DeleteShader(kService1Id))
.Times(1)
.RetiresOnSaturation();
- manager_.Destroy(true);
+ ProgressReporterStub progress_reporter;
+ manager_.Destroy(true, &progress_reporter);
// Check that resources got freed.
shader1 = manager_.GetShader(kClient1Id);
ASSERT_TRUE(shader1 == NULL);

Powered by Google App Engine
This is Rietveld 408576698