Remove allocator_extension_thunks since this layer is not required

base/trace_event/malloc_dump_provider.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/malloc_dump_provider.h"
 
 #if defined(OS_MACOSX)
 #include <malloc/malloc.h>
 #else
 #include <malloc.h>
 #endif
 
-#include "base/allocator/allocator_extension_thunks.h"
+#include "base/allocator/allocator_extension.h"
 #include "base/trace_event/process_memory_dump.h"
 
 namespace base {
 namespace trace_event {
 
 // static
 const char MallocDumpProvider::kAllocatedObjects[] = "malloc/allocated_objects";
 
 // static
 MallocDumpProvider* MallocDumpProvider::GetInstance() {
@@ skipping 11 matching lines @@
                                       ProcessMemoryDump* pmd) {
   size_t total_virtual_size = 0;
   size_t resident_size = 0;
   size_t allocated_objects_size = 0;
 #if defined(OS_MACOSX) || defined(OS_IOS)
   malloc_statistics_t stats = {0};
   malloc_zone_statistics(nullptr, &stats);
   total_virtual_size = stats.size_allocated;
   resident_size = stats.size_in_use;
   allocated_objects_size = stats.size_in_use;
+#elif defined(USE_TCMALLOC)
+  bool res =
+      allocator::GetNumericProperty("generic.heap_size", &total_virtual_size);
+  DCHECK(res);
+  res = allocator::GetNumericProperty("generic.total_physical_bytes",
+                                      &resident_size);
+  DCHECK(res);
+  res = allocator::GetNumericProperty("generic.current_allocated_bytes",
+                                      &allocated_objects_size);
+  DCHECK(res);
 #else
-  allocator::thunks::GetNumericPropertyFunction get_property_function =
-      allocator::thunks::GetGetNumericPropertyFunction();
-  if (get_property_function) {
-    // If the function is not null then tcmalloc is used. See
-    // MallocExtension::getNumericProperty.
-    bool res = get_property_function("generic.heap_size", &total_virtual_size);
-    DCHECK(res);
-    res = get_property_function("generic.total_physical_bytes", &resident_size);
-    DCHECK(res);
-    res = get_property_function("generic.current_allocated_bytes",
-                                &allocated_objects_size);
-    DCHECK(res);
-  } else {
-    struct mallinfo info = mallinfo();
-    DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
+  struct mallinfo info = mallinfo();
+  DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
 
-    // In case of Android's jemalloc |arena| is 0 and the outer pages size is
-    // reported by |hblkhd|. In case of dlmalloc the total is given by
-    // |arena| + |hblkhd|. For more details see link: http://goo.gl/fMR8lF.
-    total_virtual_size = info.arena + info.hblkhd;
-    resident_size = info.uordblks;
-    allocated_objects_size = info.uordblks;
-  }
+  // In case of Android's jemalloc |arena| is 0 and the outer pages size is
+  // reported by |hblkhd|. In case of dlmalloc the total is given by
+  // |arena| + |hblkhd|. For more details see link: http://goo.gl/fMR8lF.
+  total_virtual_size = info.arena + info.hblkhd;
+  resident_size = info.uordblks;
+  allocated_objects_size = info.uordblks;
 #endif
 
   MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
   outer_dump->AddScalar("virtual_size", MemoryAllocatorDump::kUnitsBytes,
                         total_virtual_size);
   outer_dump->AddScalar(MemoryAllocatorDump::kNameSize,
                         MemoryAllocatorDump::kUnitsBytes, resident_size);
 
   // Total allocated space is given by |uordblks|.
   MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects);
   inner_dump->AddScalar(MemoryAllocatorDump::kNameSize,
                         MemoryAllocatorDump::kUnitsBytes,
                         allocated_objects_size);
 
   return true;
 }
 
 }  // namespace trace_event
 }  // namespace base