memory-infra: rename service folder to memory_instrumentation

base/trace_event/memory_dump_manager_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/trace_event/memory_dump_manager.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
@@ skipping 229 matching lines @@
 
 }  // namespace
 
 class MemoryDumpManagerTest : public testing::Test {
  public:
   MemoryDumpManagerTest() : testing::Test(), kDefaultOptions() {}
 
   void SetUp() override {
     last_callback_success_ = false;
     message_loop_.reset(new MessageLoop());
-    mdm_.reset(new MemoryDumpManager());
+    mdm_ = MemoryDumpManager::CreateInstanceForTesting();
+    ASSERT_EQ(mdm_.get(), MemoryDumpManager::GetInstance());
     results_.clear();
-    MemoryDumpManager::SetInstanceForTesting(mdm_.get());
-    ASSERT_EQ(mdm_.get(), MemoryDumpManager::GetInstance());
   }
 
   void TearDown() override {
-    MemoryDumpManager::SetInstanceForTesting(nullptr);
     mdm_.reset();
     message_loop_.reset();
     TraceLog::DeleteForTesting();
   }
 
   // Turns a Closure into a GlobalMemoryDumpCallback, keeping track of the
   // callback result and taking care of posting the closure on the correct task
   // runner.
   void GlobalDumpCallbackAdapter(
       scoped_refptr<SingleThreadTaskRunner> task_runner,
@@ skipping 1136 matching lines @@
   EXPECT_EQ(3u, result.chrome_dump.v8_total_kb);
   // partition_alloc has partition_alloc/allocated_objects/* which is a subset
   // of partition_alloc/partitions/* so we only count the latter.
   EXPECT_EQ(4u, result.chrome_dump.partition_alloc_total_kb);
   // resident_set_kb should read from process_totals.
   EXPECT_EQ(5u, result.os_dump.resident_set_kb);
 };
 
 }  // namespace trace_event
 }  // namespace base