[NOT TO COMMIT!] Merge Chromium-specific changes in tcmalloc thru. the original gperftools r136.

third_party/tcmalloc/chromium/src/google/malloc_hook.h

Index: third_party/tcmalloc/chromium/src/google/malloc_hook.h
diff --git a/third_party/tcmalloc/chromium/src/google/malloc_hook.h b/third_party/tcmalloc/chromium/src/google/malloc_hook.h
index 245d0e16fd5ce083a463f6edc1b9197376e3a742..6faa50e4b08c3ccae4ad5e4afe5649f96ab3dfc8 100644
--- a/third_party/tcmalloc/chromium/src/google/malloc_hook.h
+++ b/third_party/tcmalloc/chromium/src/google/malloc_hook.h
@@ -237,7 +237,7 @@ class PERFTOOLS_DLL_DECL MallocHook {
   inline static bool RemovePreSbrkHook(PreSbrkHook hook) {
     return MallocHook_RemovePreSbrkHook(hook);
   }
-  inline static void InvokePreSbrkHook(ptrdiff_t increment);
+  inline static void InvokePreSbrkHook(std::ptrdiff_t increment);
 
   // The SbrkHook is invoked whenever sbrk is called -- except when
   // the increment is 0.  This is because sbrk(0) is often called
@@ -250,7 +250,7 @@ class PERFTOOLS_DLL_DECL MallocHook {
   inline static bool RemoveSbrkHook(SbrkHook hook) {
     return MallocHook_RemoveSbrkHook(hook);
   }
-  inline static void InvokeSbrkHook(const void* result, ptrdiff_t increment);
+  inline static void InvokeSbrkHook(const void* result, std::ptrdiff_t increment);
 
   // Get the current stack trace.  Try to skip all routines up to and
   // and including the caller of MallocHook::Invoke*.
@@ -346,8 +346,8 @@ class PERFTOOLS_DLL_DECL MallocHook {
                                    size_t new_size,
                                    int flags,
                                    const void* new_addr);
-  static void InvokePreSbrkHookSlow(ptrdiff_t increment);
-  static void InvokeSbrkHookSlow(const void* result, ptrdiff_t increment);
+  static void InvokePreSbrkHookSlow(std::ptrdiff_t increment);
+  static void InvokeSbrkHookSlow(const void* result, std::ptrdiff_t increment);
 };
 
 #ifdef _MSC_VER