memory-infra: Fix deadlock in MemoryDumpManager

base/trace_event/memory_dump_manager.cc

Index: base/trace_event/memory_dump_manager.cc
diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc
index 8d307cef5cbe7c0dc5eafad2bddf6f9ea08e0687..5d15caef19f15090086e511a39734438b24b09cc 100644
--- a/base/trace_event/memory_dump_manager.cc
+++ b/base/trace_event/memory_dump_manager.cc
@@ -173,9 +173,18 @@ MemoryDumpManager::MemoryDumpManager()
 }
 
 MemoryDumpManager::~MemoryDumpManager() {
-  AutoLock lock(lock_);
-  if (dump_thread_) {
-    dump_thread_->Stop();
+  Thread* dump_thread = nullptr;
+  {
+    AutoLock lock(lock_);
+    if (dump_thread_) {
+      dump_thread = dump_thread_.get();
+    }
+  }
+  if (dump_thread) {
+    dump_thread->Stop();
+  }
+  {

[Primiano Tucci (use gerrit), 2017/05/11 13:53:27]

no need for these extra set of braces here

[hjd, 2017/05/11 14:18:41]

Done.

+    AutoLock lock(lock_);
     dump_thread_.reset();
   }
 }