Support old and new weak handle API

src/global-handles.h

Index: src/global-handles.h
diff --git a/src/global-handles.h b/src/global-handles.h
index fe9ed5a2585afccd400b3f94c1efd3e504736527..20da53a185c4a232864c71c4bbbb6e2a2306d2bd 100644
--- a/src/global-handles.h
+++ b/src/global-handles.h
@@ -145,9 +145,9 @@ class GlobalHandles {
 
   // It would be nice to template this one, but it's really hard to get
   // the template instantiator to work right if you do.
-  static void MakePhantom(
-      Object** location, void* parameter, int number_of_internal_fields,
-      PhantomCallbackData<void, void, void>::Callback weak_callback);
+  static void MakePhantom(Object** location, void* parameter,
+                          int number_of_internal_fields,
+                          PhantomCallbackData<void>::Callback weak_callback);
 
   void RecordStats(HeapStats* stats);
 
@@ -345,7 +345,7 @@ class GlobalHandles {
 
 class GlobalHandles::PendingPhantomCallback {
  public:
-  typedef PhantomCallbackData<void, void, void> Data;
+  typedef PhantomCallbackData<void> Data;
   PendingPhantomCallback(Node* node, Data data, Data::Callback callback)
       : node_(node), data_(data), callback_(callback) {}