Major changes to the Chrome allocator....

third_party/tcmalloc/tcmalloc.gyp

Index: third_party/tcmalloc/tcmalloc.gyp
===================================================================
--- third_party/tcmalloc/tcmalloc.gyp	(revision 22255)
+++ third_party/tcmalloc/tcmalloc.gyp	(working copy)
@@ -31,27 +31,63 @@
         },
       },
       'sources': [
+        # tcmalloc files
         'tcmalloc/src/base/dynamic_annotations.cc',
+        'tcmalloc/src/base/dynamic_annotations.h',
         'tcmalloc/src/base/logging.cc',
+        'tcmalloc/src/base/logging.h',
         'tcmalloc/src/base/low_level_alloc.cc',
+        'tcmalloc/src/base/low_level_alloc.h',
         'tcmalloc/src/base/spinlock.cc',
+        'tcmalloc/src/base/spinlock.h',
         'tcmalloc/src/base/sysinfo.cc',
+        'tcmalloc/src/base/sysinfo.h',
         'tcmalloc/src/central_freelist.cc',
+        'tcmalloc/src/central_freelist.h',
         'tcmalloc/src/common.cc',
+        'tcmalloc/src/common.h',
         'tcmalloc/src/heap-profile-table.cc',
+        'tcmalloc/src/heap-profile-table.h',
         'tcmalloc/src/internal_logging.cc',
+        'tcmalloc/src/internal_logging.h',
+        'tcmalloc/src/linked_list.h',
         'tcmalloc/src/malloc_extension.cc',
         'tcmalloc/src/malloc_hook.cc',
-        'tcmalloc/src/page_heap.cc',
+        'tcmalloc/src/malloc_hook-inl.h',
+        'tcmalloc/src/port.h',
         'tcmalloc/src/sampler.cc',
+        'tcmalloc/src/sampler.h',
         'tcmalloc/src/span.cc',
+        'tcmalloc/src/span.h',
         'tcmalloc/src/stack_trace_table.cc',
+        'tcmalloc/src/stack_trace_table.h',
         'tcmalloc/src/stacktrace.cc',
+        'tcmalloc/src/stacktrace.h',
         'tcmalloc/src/static_vars.cc',
+        'tcmalloc/src/static_vars.h',
         'tcmalloc/src/thread_cache.cc',
-        'tcmalloc/src/windows/override_functions.cc',
-        'tcmalloc/src/windows/port.cc',
+        'tcmalloc/src/thread_cache.h',
+
+        # tcmalloc forked files
+        'allocator_shim.cc',
+        'page_heap.cc',
+        'port.cc',
+        'system-alloc.h',
+        'tcmalloc.cc',
+        'win_allocator.cc',        
+
+        # jemalloc files
+        'jemalloc/jemalloc.c',
+        'jemalloc/jemalloc.h',
+        'jemalloc/ql.h',
+        'jemalloc/qr.h',
+        'jemalloc/rb.h',
       ],
+      # sources! means that these are not compiled directly.
+      'sources!': [
+        'tcmalloc.cc',
+        'win_allocator.cc',
+      ],
       'msvs_settings': {
         # TODO(sgk):  merge this with build/common.gypi settings
         'VCLibrarianTool=': {