Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

third_party/tcmalloc/chromium/src/tests/malloc_extension_c_test.c

 /* Copyright (c) 2009, 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 54 matching lines @@
    */
 #if 0
   void* result[5];
 
   if (MallocHook_GetCallerStackTrace(result, sizeof(result)/sizeof(*result),
                                      0) < 2) {  /* should have this and main */
     FAIL("GetCallerStackTrace failed");
   }
 #endif
 
-  MallocHook_SetNewHook(&TestNewHook);
-  MallocHook_SetDeleteHook(&TestDeleteHook);
+  if (!MallocHook_AddNewHook(&TestNewHook)) {
+    FAIL("Failed to add new hook");
+  }
+  if (!MallocHook_AddDeleteHook(&TestDeleteHook)) {
+    FAIL("Failed to add delete hook");
+  }
   free(malloc(10));
   free(malloc(20));
   if (g_new_hook_calls != 2) {
     FAIL("Wrong number of calls to the new hook");
   }
   if (g_delete_hook_calls != 2) {
     FAIL("Wrong number of calls to the delete hook");
   }
+  if (!MallocHook_RemoveNewHook(&TestNewHook)) {
+    FAIL("Failed to remove new hook");
+  }
+  if (!MallocHook_RemoveDeleteHook(&TestDeleteHook)) {
+    FAIL("Failed to remove delete hook");
+  }
 }
 
 void TestMallocExtension(void) {
   int blocks;
   size_t total;
   int hist[64];
   char buffer[200];
   char* x = (char*)malloc(10);
 
   MallocExtension_VerifyAllMemory();
@@ skipping 25 matching lines @@
   free(x);
 }
 
 int main(int argc, char** argv) {
   TestMallocHook();
   TestMallocExtension();
 
   printf("PASS\n");
   return 0;
 }