Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes.

third_party/tcmalloc/chromium/src/tests/profiler_unittest.cc

 // Copyright (c) 2005, 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 23 matching lines @@
 // Define WITH_THREADS to add pthread functionality as well (otherwise, btw,
 // the num_threads argument to this program is ingored).
 
 #include "config_for_unittests.h"
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>                 // for fork()
 #endif
 #include <sys/wait.h>               // for wait()
-#include "google/profiler.h"
+#include "gperftools/profiler.h"
 #include "base/simple_mutex.h"
 #include "tests/testutil.h"
 
 static int result = 0;
 static int g_iters = 0;   // argv[1]
 
 Mutex mutex(Mutex::LINKER_INITIALIZED);
 
 static void test_other_thread() {
 #ifndef NO_THREADS
   ProfilerRegisterThread();
 
   int i, m;
   char b[128];
   MutexLock ml(&mutex);
   for (m = 0; m < 1000000; ++m) {          // run millions of times
     for (i = 0; i < g_iters; ++i ) {
       result ^= i;
     }
-    snprintf(b, sizeof(b), "%d", result);  // get some libc action
+    snprintf(b, sizeof(b), "other: %d", result);  // get some libc action
   }
 #endif
 }
 
 static void test_main_thread() {
   int i, m;
   char b[128];
   MutexLock ml(&mutex);
   for (m = 0; m < 1000000; ++m) {          // run millions of times
     for (i = 0; i < g_iters; ++i ) {
       result ^= i;
     }
-    snprintf(b, sizeof(b), "%d", result);  // get some libc action
+    snprintf(b, sizeof(b), "same: %d", result);  // get some libc action
   }
 }
 
 int main(int argc, char** argv) {
   if ( argc <= 1 ) {
     fprintf(stderr, "USAGE: %s <iters> [num_threads] [filename]\n", argv[0]);
     fprintf(stderr, "   iters: How many million times to run the XOR test.\n");
     fprintf(stderr, "   num_threads: how many concurrent threads.\n");
     fprintf(stderr, "                0 or 1 for single-threaded mode,\n");
     fprintf(stderr, "                -# to fork instead of thread.\n");
@@ skipping 45 matching lines @@
 #endif
 
   test_main_thread();
 
   if (filename) {
     ProfilerStop();
   }
 
   return 0;
 }