Landing http://codereview.chromium.org/7033062/:

third_party/tcmalloc/chromium/src/memory_region_map.cc

 /* Copyright (c) 2006, Google Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 610 matching lines @@
               "to %"PRIuS" flags %d new_addr=0x%"PRIxPTR,
               (uintptr_t)result, (uintptr_t)old_addr,
                old_size, new_size, flags,
                flags & MREMAP_FIXED ? (uintptr_t)new_addr : 0);
   if (result != reinterpret_cast<void*>(-1)) {
     RecordRegionRemoval(old_addr, old_size);
     RecordRegionAddition(result, new_size);
   }
 }
 
-extern "C" void* __sbrk(ptrdiff_t increment);  // defined in libc
+extern "C" void* __sbrk(std::ptrdiff_t increment);  // defined in libc
 
-void MemoryRegionMap::SbrkHook(const void* result, ptrdiff_t increment) {
+void MemoryRegionMap::SbrkHook(const void* result, std::ptrdiff_t increment) {
   RAW_VLOG(10, "Sbrk = 0x%"PRIxPTR" of %"PRIdS"", (uintptr_t)result, increment);
   if (result != reinterpret_cast<void*>(-1)) {
     if (increment > 0) {
       void* new_end = sbrk(0);
       RecordRegionAddition(result, reinterpret_cast<uintptr_t>(new_end) -
                                    reinterpret_cast<uintptr_t>(result));
     } else if (increment < 0) {
       void* new_end = sbrk(0);
       RecordRegionRemoval(new_end, reinterpret_cast<uintptr_t>(result) -
                                    reinterpret_cast<uintptr_t>(new_end));
     }
   }
 }
 
 void MemoryRegionMap::LogAllLocked() {
   RAW_CHECK(LockIsHeld(), "should be held (by this thread)");
   RAW_LOG(INFO, "List of regions:");
   uintptr_t previous = 0;
   for (RegionSet::const_iterator r = regions_->begin();
        r != regions_->end(); ++r) {
     RAW_LOG(INFO, "Memory region 0x%"PRIxPTR"..0x%"PRIxPTR" "
                   "from 0x%"PRIxPTR" stack=%d",
                   r->start_addr, r->end_addr, r->caller(), r->is_stack);
     RAW_CHECK(previous < r->end_addr, "wow, we messed up the set order");
       // this must be caused by uncontrolled recursive operations on regions_
     previous = r->end_addr;
   }
   RAW_LOG(INFO, "End of regions list");
 }