[counting_allocator] Chrome changes.

base/allocator/allocator_shim.h

 // 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.
 
 #ifndef BASE_ALLOCATOR_ALLOCATOR_SHIM_H_
 #define BASE_ALLOCATOR_ALLOCATOR_SHIM_H_
 
 #include <stddef.h>
 
 #include "base/base_export.h"
@@ skipping 66 matching lines @@
                                  unsigned num_requested,
                                  void* context);
   using BatchFreeFn = void(const AllocatorDispatch* self,
                            void** to_be_freed,
                            unsigned num_to_be_freed,
                            void* context);
   using FreeDefiniteSizeFn = void(const AllocatorDispatch* self,
                                   void* ptr,
                                   size_t size,
                                   void* context);
+  using TaggedAllocFn = void*(const AllocatorDispatch* self,
+                              size_t size,
+                              const char* tag);
 
   AllocFn* const alloc_function;
   AllocZeroInitializedFn* const alloc_zero_initialized_function;
   AllocAlignedFn* const alloc_aligned_function;
   ReallocFn* const realloc_function;
   FreeFn* const free_function;
   GetSizeEstimateFn* const get_size_estimate_function;
   BatchMallocFn* const batch_malloc_function;
   BatchFreeFn* const batch_free_function;
   FreeDefiniteSizeFn* const free_definite_size_function;
+  TaggedAllocFn* const tagged_alloc_function;
 
   const AllocatorDispatch* next;
 
   // |default_dispatch| is statically defined by one (and only one) of the
   // allocator_shim_default_dispatch_to_*.cc files, depending on the build
   // configuration.
   static const AllocatorDispatch default_dispatch;
 };
 
 // When true makes malloc behave like new, w.r.t calling the new_handler if
@@ skipping 17 matching lines @@
 
 #if defined(OS_MACOSX)
 // On macOS, the allocator shim needs to be turned on during runtime.
 BASE_EXPORT void InitializeAllocatorShim();
 #endif  // defined(OS_MACOSX)
 
 }  // namespace allocator
 }  // namespace base
 
 #endif  // BASE_ALLOCATOR_ALLOCATOR_SHIM_H_