memory-infra: rename service folder to memory_instrumentation

base/trace_event/memory_dump_manager_unittest.cc

Index: base/trace_event/memory_dump_manager_unittest.cc
diff --git a/base/trace_event/memory_dump_manager_unittest.cc b/base/trace_event/memory_dump_manager_unittest.cc
index c641ff061c96fad839194233090b900b956f3ad8..9806c5008ec4bd563b33b6e9278f90c5e5729872 100644
--- a/base/trace_event/memory_dump_manager_unittest.cc
+++ b/base/trace_event/memory_dump_manager_unittest.cc
@@ -247,14 +247,12 @@ class MemoryDumpManagerTest : public testing::Test {
   void SetUp() override {
     last_callback_success_ = false;
     message_loop_.reset(new MessageLoop());
-    mdm_.reset(new MemoryDumpManager());
-    results_.clear();
-    MemoryDumpManager::SetInstanceForTesting(mdm_.get());
+    mdm_ = MemoryDumpManager::CreateInstanceForTesting();
     ASSERT_EQ(mdm_.get(), MemoryDumpManager::GetInstance());
+    results_.clear();
   }
 
   void TearDown() override {
-    MemoryDumpManager::SetInstanceForTesting(nullptr);
     mdm_.reset();
     message_loop_.reset();
     TraceLog::DeleteForTesting();