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

Unified Diff: gpu/command_buffer/service/memory_program_cache_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/memory_program_cache_unittest.cc
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc
index a4a78c6299078af5dd2595aaa5fc8fb84dce4e07..ced1211541e051775885823fa3db78968c8e9755 100644
--- a/gpu/command_buffer/service/memory_program_cache_unittest.cc
+++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc
@@ -13,6 +13,7 @@
#include "gpu/command_buffer/common/gles2_cmd_format.h"
#include "gpu/command_buffer/service/gl_utils.h"
#include "gpu/command_buffer/service/gpu_service_test.h"
+#include "gpu/command_buffer/service/progress_reporter_stub.h"
#include "gpu/command_buffer/service/shader_manager.h"
#include "gpu/command_buffer/service/shader_translator.h"
#include "gpu/command_buffer/service/test_helper.h"
@@ -79,9 +80,11 @@ class MemoryProgramCacheTest : public GpuServiceTest {
: cache_(new MemoryProgramCache(kCacheSizeBytes, kDisableGpuDiskCache)),
vertex_shader_(NULL),
fragment_shader_(NULL),
- shader_cache_count_(0) {
+ shader_cache_count_(0) {}
+ ~MemoryProgramCacheTest() override {
+ ProgressReporterStub progress_reporter;
+ shader_manager_.Destroy(false, &progress_reporter);
}
- ~MemoryProgramCacheTest() override { shader_manager_.Destroy(false); }
void ShaderCacheCb(const std::string& key, const std::string& shader) {
shader_cache_count_++;

Powered by Google App Engine
This is Rietveld 408576698