Revert the commits adding new GC-related APIs.

test/cctest/test-heap-profiler.cc

 // Copyright 2011 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 1173 matching lines @@
   CHECK_EQ(ccc, GetProperty(n_CCC, v8::HeapGraphEdge::kInternal, "native"));
 }
 
 
 class GraphWithImplicitRefs {
  public:
   static const int kObjectsCount = 4;
   explicit GraphWithImplicitRefs(LocalContext* env) {
     CHECK_EQ(NULL, instance_);
     instance_ = this;
-    isolate_ = (*env)->GetIsolate();
+    v8::Isolate* isolate = (*env)->GetIsolate();
     for (int i = 0; i < kObjectsCount; i++) {
-      objects_[i] =
-          v8::Persistent<v8::Object>::New(isolate_, v8::Object::New());
+      objects_[i] = v8::Persistent<v8::Object>::New(isolate, v8::Object::New());
     }
     (*env)->Global()->Set(v8_str("root_object"), objects_[0]);
   }
   ~GraphWithImplicitRefs() {
     instance_ = NULL;
   }
 
   static void gcPrologue(v8::GCType type, v8::GCCallbackFlags flags) {
     instance_->AddImplicitReferences();
   }
 
  private:
   void AddImplicitReferences() {
     // 0 -> 1
-    v8::V8::SetObjectGroupId(isolate_,
-                             v8::Persistent<v8::Object>::Cast(objects_[0]),
-                             v8::UniqueId(1));
-    v8::V8::SetObjectGroupRepresentative(
-        isolate_,
-        v8::UniqueId(1),
-        v8::Persistent<v8::Object>::Cast(objects_[0]));
-    v8::V8::AddImplicitReference(isolate_,
-                                 v8::UniqueId(1),
-                                 v8::Persistent<v8::Object>::Cast(objects_[1]));
+    v8::V8::AddImplicitReferences(
+        v8::Persistent<v8::Object>::Cast(objects_[0]), &objects_[1], 1);
     // Adding two more references(note length=2 in params): 1 -> 2, 1 -> 3
-    v8::V8::SetObjectGroupId(isolate_,
-                             v8::Persistent<v8::Object>::Cast(objects_[1]),
-                             v8::UniqueId(2));
-    v8::V8::SetObjectGroupRepresentative(
-        isolate_,
-        v8::UniqueId(2),
-        v8::Persistent<v8::Object>::Cast(objects_[1]));
-    v8::V8::AddImplicitReference(isolate_,
-                                 v8::UniqueId(2),
-                                 v8::Persistent<v8::Object>::Cast(objects_[2]));
-    v8::V8::AddImplicitReference(isolate_,
-                                 v8::UniqueId(2),
-                                 v8::Persistent<v8::Object>::Cast(objects_[3]));
+    v8::V8::AddImplicitReferences(
+        v8::Persistent<v8::Object>::Cast(objects_[1]), &objects_[2], 2);
   }
 
   v8::Persistent<v8::Value> objects_[kObjectsCount];
   static GraphWithImplicitRefs* instance_;
-  v8::Isolate* isolate_;
 };
 
 GraphWithImplicitRefs* GraphWithImplicitRefs::instance_ = NULL;
 
 
 TEST(HeapSnapshotImplicitReferences) {
   LocalContext env;
   v8::HandleScope scope(env->GetIsolate());
   v8::HeapProfiler* heap_profiler = env->GetIsolate()->GetHeapProfiler();
 
@@ skipping 535 matching lines @@
   // Check all the objects have got their names.
   // ... well check just every 8th because otherwise it's too slow in debug.
   for (int i = 0; i < num_objects - 1; i += 8) {
     i::EmbeddedVector<char, 100> var_name;
     i::OS::SNPrintF(var_name, "f_%d", i);
     const v8::HeapGraphNode* f_object = GetProperty(
         context_object, v8::HeapGraphEdge::kContextVariable, var_name.start());
     CHECK_NE(NULL, f_object);
   }
 }