Unify phantom and internal fields weak handle callbacks

test/cctest/test-api.cc

 // Copyright 2012 the V8 project authors. 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
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 7778 matching lines @@
 
   int y() { return y_; }
   void set_y(int y) { y_ = y; }
 
  private:
   int y_;
   int x_;
 };
 
 
-void CheckInternalFields(
-    const v8::InternalFieldsCallbackData<Trivial, Trivial2>& data) {
+void CheckInternalFields(const v8::PhantomCallbackData<
+    v8::Persistent<v8::Object>, Trivial, Trivial2>& data) {
+  v8::Persistent<v8::Object>* handle = data.GetParameter();
+  handle->Reset();
   Trivial* t1 = data.GetInternalField1();
   Trivial2* t2 = data.GetInternalField2();
   CHECK_EQ(42, t1->x());
   CHECK_EQ(103, t2->x());
   t1->set_x(1729);
   t2->set_x(33550336);
 }
 
 
 void InternalFieldCallback(bool global_gc) {
@@ skipping 17 matching lines @@
 
     obj->SetAlignedPointerInInternalField(0, t1);
     t1 = reinterpret_cast<Trivial*>(obj->GetAlignedPointerFromInternalField(0));
     CHECK_EQ(42, t1->x());
 
     obj->SetAlignedPointerInInternalField(1, t2);
     t2 =
         reinterpret_cast<Trivial2*>(obj->GetAlignedPointerFromInternalField(1));
     CHECK_EQ(103, t2->x());
 
-    handle.SetPhantom(CheckInternalFields, 0, 1);
+    handle.SetPhantom<v8::Persistent<v8::Object>, Trivial, Trivial2>(
+        &handle, 0, 1, CheckInternalFields);
     if (!global_gc) {
       handle.MarkIndependent();
     }
   }
   if (global_gc) {
     CcTest::heap()->CollectAllGarbage(TestHeap::Heap::kNoGCFlags);
   } else {
     CcTest::heap()->CollectGarbage(i::NEW_SPACE);
   }
 
@@ skipping 16903 matching lines @@
                    "bar2.js");
 }
 
 
 TEST(StreamingScriptWithSourceMappingURLInTheMiddle) {
   const char* chunks[] = {"function foo() { ret", "urn 13; }\n//#",
                           " sourceMappingURL=bar2.js\n", "foo();", NULL};
   RunStreamingTest(chunks, v8::ScriptCompiler::StreamedSource::UTF8, true, NULL,
                    "bar2.js");
 }