Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

base/trace_event/memory_dump_manager.h

Index: base/trace_event/memory_dump_manager.h
diff --git a/base/trace_event/memory_dump_manager.h b/base/trace_event/memory_dump_manager.h
index 1a22e61b34a5640ee5291458b29da6b14e4ceaef..fbc71d5e006e0048a2f09c2d83413f2e1676fba9 100644
--- a/base/trace_event/memory_dump_manager.h
+++ b/base/trace_event/memory_dump_manager.h
@@ -50,17 +50,17 @@ class BASE_EXPORT MemoryDumpManager : public TraceLog::EnabledStateObserver {
   void OnTraceLogDisabled() override;
 
  private:
-  friend struct DefaultDeleter<MemoryDumpManager>;  // For the testing instance.
   friend struct DefaultSingletonTraits<MemoryDumpManager>;
   friend class MemoryDumpManagerTest;
 
   static const char kTraceCategory[];
 
-  static void SetInstanceForTesting(MemoryDumpManager* instance);
-
   MemoryDumpManager();
   virtual ~MemoryDumpManager();
 
+  // Tears down the singleton instance.
+  static void DeleteForTesting();
+
   // Broadcasts the dump requests to the other processes.
   void BroadcastDumpRequest();