A Speculative Revert for 164939 - Use tcmalloc's debugallocation for Debug builds

base/allocator/allocator_shim.cc

 // Copyright (c) 2012 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/allocator/allocator_shim.h"
 
 #include <config.h>
 #include "base/allocator/allocator_extension_thunks.h"
 #include "base/profiler/alternate_timer.h"
 #include "base/sysinfo.h"
@@ skipping 38 matching lines @@
 
 // The names of the environment variables that can optionally control the
 // selection of the allocator.  The primary may be used to control overall
 // allocator selection, and the secondary can be used to specify an allocator
 // to use in sub-processes.
 static const char primary_name[] = "CHROME_ALLOCATOR";
 static const char secondary_name[] = "CHROME_ALLOCATOR_2";
 
 // We include tcmalloc and the win_allocator to get as much inlining as
 // possible.
-#include "debugallocation_shim.cc"
+#include "tcmalloc.cc"
 #include "win_allocator.cc"
 
 // Forward declarations from jemalloc.
 extern "C" {
 void* je_malloc(size_t s);
 void* je_realloc(void* p, size_t s);
 void je_free(void* s);
 size_t je_msize(void* p);
 bool je_malloc_init_hard();
 void* je_memalign(size_t a, size_t s);
@@ skipping 366 matching lines @@
 void TCMallocDoFreeForTest(void* ptr) {
   do_free(ptr);
 }
 
 size_t ExcludeSpaceForMarkForTest(size_t size) {
   return ExcludeSpaceForMark(size);
 }
 
 }  // namespace allocator.
 }  // namespace base.