Remove several JSFunction delegator functions.

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 ad7aa629680b2d79b07d0c4db4ce3d9ee640c39b..fa9051e3aa193db03b2f0e4b0de0caa7fc3f8bd1 100644
--- a/test/cctest/test-heap.cc
+++ b/test/cctest/test-heap.cc
@@ -1652,7 +1652,8 @@ static int CountOptimizedUserFunctions(v8::Handle<v8::Context> context) {
   int count = 0;
   Handle<Context> icontext = v8::Utils::OpenHandle(*context);
   Object* object = icontext->get(Context::OPTIMIZED_FUNCTIONS_LIST);
-  while (object->IsJSFunction() && !JSFunction::cast(object)->IsBuiltin()) {
+  while (object->IsJSFunction() &&
+         !JSFunction::cast(object)->shared()->IsBuiltin()) {
     count++;
     object = JSFunction::cast(object)->next_function_link();
   }
@@ -1796,7 +1797,7 @@ static int CountOptimizedUserFunctionsWithGC(v8::Handle<v8::Context> context,
   Handle<Object> object(icontext->get(Context::OPTIMIZED_FUNCTIONS_LIST),
                         isolate);
   while (object->IsJSFunction() &&
-         !Handle<JSFunction>::cast(object)->IsBuiltin()) {
+         !Handle<JSFunction>::cast(object)->shared()->IsBuiltin()) {
     count++;
     if (count == n) isolate->heap()->CollectAllGarbage();
     object = Handle<Object>(