Remove dependency on allocator from 'content' targets

base/trace_event/trace_event_memory.cc

 // Copyright 2013 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/trace_event_memory.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 127 matching lines @@
   // Each item in the trace event stack contains both name and category so tell
   // tcmalloc that we have returned |count| * 2 stack frames.
   return static_cast<int>(count * 2);
 }
 
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////////////
 
 TraceMemoryController::TraceMemoryController(
-    scoped_refptr<SingleThreadTaskRunner> task_runner,
-    HeapProfilerStartFunction heap_profiler_start_function,
-    HeapProfilerStopFunction heap_profiler_stop_function,
-    GetHeapProfileFunction get_heap_profile_function)
-    : task_runner_(task_runner.Pass()),
-      heap_profiler_start_function_(heap_profiler_start_function),
-      heap_profiler_stop_function_(heap_profiler_stop_function),
-      get_heap_profile_function_(get_heap_profile_function),
-      weak_factory_(this) {
+    scoped_refptr<SingleThreadTaskRunner> task_runner)
+    : task_runner_(task_runner.Pass()), weak_factory_(this) {
   // Force the "memory" category to show up in the trace viewer.
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("memory"), "init");
   // Watch for the tracing system being enabled.
   TraceLog::GetInstance()->AddEnabledStateObserver(this);
 }
 
 TraceMemoryController::~TraceMemoryController() {
   if (dump_timer_.IsRunning())
     StopProfiling();
   TraceLog::GetInstance()->RemoveEnabledStateObserver(this);
@@ skipping 24 matching lines @@
 }
 
 void TraceMemoryController::StartProfiling() {
   // Watch for the tracing framework sending enabling more than once.
   if (dump_timer_.IsRunning())
     return;
   DVLOG(1) << "Starting trace memory";
   InitThreadLocalStorage();
   ScopedTraceMemory::set_enabled(true);
   // Call ::HeapProfilerWithPseudoStackStart().
-  heap_profiler_start_function_(&GetPseudoStack);
+  allocator::HeapProfilerStart(&GetPseudoStack);
   const int kDumpIntervalSeconds = 5;
   dump_timer_.Start(FROM_HERE,
                     TimeDelta::FromSeconds(kDumpIntervalSeconds),
                     base::Bind(&TraceMemoryController::DumpMemoryProfile,
                                weak_factory_.GetWeakPtr()));
 }
 
 void TraceMemoryController::DumpMemoryProfile() {
   // Don't trace allocations here in the memory tracing system.
   INTERNAL_TRACE_MEMORY(TRACE_DISABLED_BY_DEFAULT("memory"),
                         TRACE_MEMORY_IGNORE);
 
   DVLOG(1) << "DumpMemoryProfile";
   // MemoryDumpHolder takes ownership of this string. See GetHeapProfile() in
   // tcmalloc for details.
-  char* dump = get_heap_profile_function_();
+  char* dump = allocator::GetHeapProfile();
   const int kSnapshotId = 1;
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("memory"),
       "memory::Heap",
       kSnapshotId,
       scoped_refptr<ConvertableToTraceFormat>(new MemoryDumpHolder(dump)));
 }
 
 void TraceMemoryController::StopProfiling() {
   // Watch for the tracing framework sending disabled more than once.
   if (!dump_timer_.IsRunning())
     return;
   DVLOG(1) << "Stopping trace memory";
   dump_timer_.Stop();
   ScopedTraceMemory::set_enabled(false);
   CleanupThreadLocalStorage();
   // Call ::HeapProfilerStop().
-  heap_profiler_stop_function_();
+  allocator::HeapProfilerStop();
 }
 
 bool TraceMemoryController::IsTimerRunningForTest() const {
   return dump_timer_.IsRunning();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 // static
 bool ScopedTraceMemory::enabled_ = false;
@@ skipping 181 matching lines @@
   if (!base::HexStringToUInt64(hex_address, &address))
     return "error";
   if (!address)
     return "null";
   // Note that this cast handles 64-bit to 32-bit conversion if necessary.
   return reinterpret_cast<const char*>(address);
 }
 
 }  // namespace trace_event
 }  // namespace base