Merge bleeding_edge revision 2961 to trunk to fix test shell tests.

src/heap-profiler.cc

Index: src/heap-profiler.cc
===================================================================
--- src/heap-profiler.cc	(revision 2957)
+++ src/heap-profiler.cc	(working copy)
@@ -67,10 +67,9 @@
   if (obj->IsJSObject()) {
     JSObject* js_obj = JSObject::cast(obj);
     String* constructor = JSObject::cast(js_obj)->constructor_name();
-    // Differentiate Array, Function, and Object instances.
+    // Differentiate Object and Array instances.
     if (fine_grain && (constructor == Heap::Object_symbol() ||
-                       constructor == Heap::Array_symbol() ||
-                       constructor == Heap::function_class_symbol())) {
+                       constructor == Heap::Array_symbol())) {
       return JSObjectsCluster(constructor, obj);
     } else {
       return JSObjectsCluster(constructor);