Remove dependency on allocator from 'content' targets

base/trace_event/trace_event_memory.h

Index: base/trace_event/trace_event_memory.h
diff --git a/base/trace_event/trace_event_memory.h b/base/trace_event/trace_event_memory.h
index 7088080de9b362ffd80eba8b919c657d79c0e82c..21189037596a625001bd2782bb7b41c72235dd64 100644
--- a/base/trace_event/trace_event_memory.h
+++ b/base/trace_event/trace_event_memory.h
@@ -5,6 +5,7 @@
 #ifndef BASE_TRACE_EVENT_TRACE_EVENT_MEMORY_H_
 #define BASE_TRACE_EVENT_TRACE_EVENT_MEMORY_H_
 
+#include "base/allocator/allocator_extension.h"
 #include "base/base_export.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
@@ -30,19 +31,9 @@ namespace trace_event {
 class BASE_EXPORT TraceMemoryController
     : public TraceLog::EnabledStateObserver {
  public:
-  typedef int (*StackGeneratorFunction)(int skip_count, void** stack);
-  typedef void (*HeapProfilerStartFunction)(StackGeneratorFunction callback);
-  typedef void (*HeapProfilerStopFunction)();
-  typedef char* (*GetHeapProfileFunction)();
-
   // |task_runner| must be a task runner for the primary thread for the client
-  // process, e.g. the UI thread in a browser. The function pointers must be
-  // pointers to tcmalloc heap profiling functions; by avoiding direct calls to
-  // these functions we avoid a dependency on third_party/tcmalloc from base.
-  TraceMemoryController(scoped_refptr<SingleThreadTaskRunner> task_runner,
-                        HeapProfilerStartFunction heap_profiler_start_function,
-                        HeapProfilerStopFunction heap_profiler_stop_function,
-                        GetHeapProfileFunction get_heap_profile_function);
+  // process, e.g. the UI thread in a browser.
+  TraceMemoryController(scoped_refptr<SingleThreadTaskRunner> task_runner);
   ~TraceMemoryController() override;
 
   // base::trace_event::TraceLog::EnabledStateChangedObserver overrides:
@@ -66,12 +57,6 @@ class BASE_EXPORT TraceMemoryController
   // Ensures the observer starts and stops tracing on the primary thread.
   scoped_refptr<SingleThreadTaskRunner> task_runner_;
 
-  // Pointers to tcmalloc heap profiling functions. Allows this class to use
-  // tcmalloc functions without introducing a dependency from base to tcmalloc.
-  HeapProfilerStartFunction heap_profiler_start_function_;
-  HeapProfilerStopFunction heap_profiler_stop_function_;
-  GetHeapProfileFunction get_heap_profile_function_;
-
   // Timer to schedule memory profile dumps.
   RepeatingTimer dump_timer_;