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

third_party/tcmalloc/chromium/src/base/googleinit.h

 // 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 15 matching lines @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // ---
 // Author: Jacob Hoffman-Andrews
 
 #ifndef _GOOGLEINIT_H
 #define _GOOGLEINIT_H
 
+#include "base/logging.h"
+
 class GoogleInitializer {
  public:
-  typedef void (*void_function)(void);
-  GoogleInitializer(const char* name, void_function f) {
-    f();
+  typedef void (*VoidFunction)(void);
+  GoogleInitializer(const char* name, VoidFunction ctor, VoidFunction dtor)
+      : name_(name), destructor_(dtor) {
+    // TODO(dmikurube): Re-enable the latest gperftools here.
+    // RAW_VLOG was called here, but it is disabled since this googleinit.h is
+    // included from out of third_party/tcmalloc.
+    // "base/logging.h" (included above) indicates Chromium's base/logging.h
+    // when this googleinit.h is included from out of third_party/tcmalloc.

[jar (doing other things), 2012/02/28 22:15:49]

Suggest you have comment, and then show exactly the code that you chose to
remove as "commented out code."  In this case, it might be:

// We commented out the following lines, since chromium does // not have the
proper includes to log using these macros.
// RAW_VLOG(......)

[Dai Mikurube (NOT FULLTIME), 2012/02/28 23:05:43]

Done.

+    if (ctor)
+      ctor();
   }
+  ~GoogleInitializer() {
+    // TODO(dmikurube): Re-enable the latest gperftools here.
+    // The same as above.
+    if (destructor_)
+      destructor_();
+  }
+
+ private:
+  const char* const name_;
+  const VoidFunction destructor_;
 };
 
 #define REGISTER_MODULE_INITIALIZER(name, body)                 \
   namespace {                                                   \
     static void google_init_module_##name () { body; }          \
     GoogleInitializer google_initializer_module_##name(#name,   \
-            google_init_module_##name);                         \
+            google_init_module_##name, NULL);                   \
   }
 
+#define REGISTER_MODULE_DESTRUCTOR(name, body)                  \
+  namespace {                                                   \
+    static void google_destruct_module_##name () { body; }      \
+    GoogleInitializer google_destructor_module_##name(#name,    \
+            NULL, google_destruct_module_##name);               \
+  }
+
+
 #endif /* _GOOGLEINIT_H */