base: Add support for malloc zones to the allocator shim

base/allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc

 // Copyright 2016 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 <malloc.h>
 
 #include "base/allocator/allocator_shim.h"
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID) && __ANDROID_API__ < 17
@@ skipping 14 matching lines @@
 void* __real_calloc(size_t, size_t);
 void* __real_realloc(void*, size_t);
 void* __real_memalign(size_t, size_t);
 void* __real_free(void*);
 }  // extern "C"
 
 namespace {
 
 using base::allocator::AllocatorDispatch;
 
-void* RealMalloc(const AllocatorDispatch*, size_t size) {
+void* RealMalloc(const AllocatorDispatch*, size_t size, void* context) {
   return __real_malloc(size);
 }
 
-void* RealCalloc(const AllocatorDispatch*, size_t n, size_t size) {
+void* RealCalloc(const AllocatorDispatch*,
+                 size_t n,
+                 size_t size,
+                 void* context) {
   return __real_calloc(n, size);
 }
 
-void* RealRealloc(const AllocatorDispatch*, void* address, size_t size) {
+void* RealRealloc(const AllocatorDispatch*,
+                  void* address,
+                  size_t size,
+                  void* context) {
   return __real_realloc(address, size);
 }
 
-void* RealMemalign(const AllocatorDispatch*, size_t alignment, size_t size) {
+void* RealMemalign(const AllocatorDispatch*,
+                   size_t alignment,
+                   size_t size,
+                   void* context) {
   return __real_memalign(alignment, size);
 }
 
-void RealFree(const AllocatorDispatch*, void* address) {
+void RealFree(const AllocatorDispatch*, void* address, void* context) {
   __real_free(address);
 }
 
 #if defined(OS_ANDROID) && __ANDROID_API__ < 17
 size_t DummyMallocUsableSize(const void*) { return 0; }
 #endif
 
-size_t RealSizeEstimate(const AllocatorDispatch*, void* address) {
+size_t RealSizeEstimate(const AllocatorDispatch*,
+                        void* address,
+                        void* context) {
 #if defined(OS_ANDROID)
 #if __ANDROID_API__ < 17
   // malloc_usable_size() is available only starting from API 17.
   // TODO(dskiba): remove once we start building against 17+.
   using MallocUsableSizeFunction = decltype(malloc_usable_size)*;
   static MallocUsableSizeFunction usable_size_function = nullptr;
   if (!usable_size_function) {
     void* function_ptr = dlsym(RTLD_DEFAULT, "malloc_usable_size");
     if (function_ptr) {
       usable_size_function = reinterpret_cast<MallocUsableSizeFunction>(
@@ skipping 20 matching lines @@
     &RealCalloc,       /* alloc_zero_initialized_function */
     &RealMemalign,     /* alloc_aligned_function */
     &RealRealloc,      /* realloc_function */
     &RealFree,         /* free_function */
     &RealSizeEstimate, /* get_size_estimate_function */
     nullptr,           /* batch_malloc_function */
     nullptr,           /* batch_free_function */
     nullptr,           /* free_definite_size_function */
     nullptr,           /* next */
 };