memory-infra: rename service folder to memory_instrumentation

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 bd00bd66993e2b5821ef53b8cd0eefd610476d8b..008b22a2d30be84f4e79db9b2c20de715c7c95ce 100644
--- a/base/trace_event/memory_dump_manager.cc
+++ b/base/trace_event/memory_dump_manager.cc
@@ -157,8 +157,11 @@ MemoryDumpManager* MemoryDumpManager::GetInstance() {
 }
 
 // static
-void MemoryDumpManager::SetInstanceForTesting(MemoryDumpManager* instance) {
-  g_instance_for_testing = instance;
+std::unique_ptr<MemoryDumpManager>
+MemoryDumpManager::CreateInstanceForTesting() {
+  std::unique_ptr<MemoryDumpManager> instance(new MemoryDumpManager());

[hjd, 2017/05/22 10:46:29]

nit: MakeUnique?

[Primiano Tucci (use gerrit), 2017/05/22 11:42:36]

ah good point, I tried, but this can't be: the ctor is private due to Singleton
and MakeUnique can't use it (as technically MakeUnique is outside of this
class). so I think this should stay as it is.

+  g_instance_for_testing = instance.get();
+  return instance;
 }
 
 MemoryDumpManager::MemoryDumpManager()
@@ -186,6 +189,7 @@ MemoryDumpManager::~MemoryDumpManager() {
   }
   AutoLock lock(lock_);
   dump_thread_.reset();
+  g_instance_for_testing = nullptr;
 }
 
 void MemoryDumpManager::EnableHeapProfilingIfNeeded() {