Refactor dependent code.

test/cctest/test-heap.cc

Index: test/cctest/test-heap.cc
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
index 41e6c24b9f0331c24a5b86599ba6bdc409655588..4500ade73df21b75c0cfdb8a60f3f548fa097a8a 100644
--- a/test/cctest/test-heap.cc
+++ b/test/cctest/test-heap.cc
@@ -4722,12 +4722,12 @@ TEST(EnsureAllocationSiteDependentCodesProcessed) {
 
     CompileRun("%OptimizeFunctionOnNextCall(bar); bar();");
 
-    DependentCode::GroupStartIndexes starts(site->dependent_code());
-    CHECK_GE(starts.number_of_entries(), 1);
-    int index = starts.at(DependentCode::kAllocationSiteTransitionChangedGroup);
-    CHECK(site->dependent_code()->object_at(index)->IsWeakCell());
+    CHECK_EQ(DependentCode::kAllocationSiteTransitionChangedGroup,
+             site->dependent_code()->group());
+    CHECK_EQ(1, site->dependent_code()->count());
+    CHECK(site->dependent_code()->object_at(0)->IsWeakCell());
     Code* function_bar = Code::cast(
-        WeakCell::cast(site->dependent_code()->object_at(index))->value());
+        WeakCell::cast(site->dependent_code()->object_at(0))->value());
     Handle<JSFunction> bar_handle = Handle<JSFunction>::cast(
         v8::Utils::OpenHandle(*v8::Local<v8::Function>::Cast(
             CcTest::global()
@@ -4744,10 +4744,8 @@ TEST(EnsureAllocationSiteDependentCodesProcessed) {
 
   // The site still exists because of our global handle, but the code is no
   // longer referred to by dependent_code().
-  DependentCode::GroupStartIndexes starts(site->dependent_code());
-  int index = starts.at(DependentCode::kAllocationSiteTransitionChangedGroup);
-  CHECK(site->dependent_code()->object_at(index)->IsWeakCell() &&
-        WeakCell::cast(site->dependent_code()->object_at(index))->cleared());
+  CHECK(site->dependent_code()->object_at(0)->IsWeakCell() &&
+        WeakCell::cast(site->dependent_code()->object_at(0))->cleared());
 }