Merge the Merlin heap tracing to top-of-trunk.

runtime/vm/raw_object.h

Index: runtime/vm/raw_object.h
diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h
index 5ac48ecf9a02ef759a37fcdda2fd4e1f0bff3718..6ad9c3fdc8302d1a35c4a2335ccc991e00054629 100644
--- a/runtime/vm/raw_object.h
+++ b/runtime/vm/raw_object.h
@@ -389,6 +389,10 @@ class RawObject {
   friend class Heap;
   friend class HeapProfiler;
   friend class HeapProfilerRootVisitor;
+  friend class HeapTrace;
+  friend class HeapTraceDebugObjectVisitor;
+  friend class HeapTraceHandleVisitor;
+  friend class HeapTraceVisitor;
   friend class MarkingVisitor;
   friend class Object;
   friend class RawInstructions;
@@ -442,6 +446,7 @@ class RawClass : public RawObject {
   intptr_t token_pos_;
   uint8_t state_bits_;  // state, is_const, is_implemented.
 
+  friend class HeapTrace;
   friend class Instance;
   friend class Object;
   friend class RawInstance;
@@ -1118,6 +1123,8 @@ class RawString : public RawInstance {
   RawSmi* length_;
   RawSmi* hash_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->hash_); }
+
+  friend class HeapTrace;
 };
 
 
@@ -1127,8 +1134,9 @@ class RawOneByteString : public RawString {
   // Variable length data follows here.
   uint8_t data_[0];
 
-  friend class SnapshotReader;
   friend class ApiMessageReader;
+  friend class HeapTrace;
+  friend class SnapshotReader;
 };
 
 
@@ -1138,6 +1146,7 @@ class RawTwoByteString : public RawString {
   // Variable length data follows here.
   uint16_t data_[0];
 
+  friend class HeapTrace;
   friend class SnapshotReader;
 };
 
@@ -1217,6 +1226,7 @@ class RawArray : public RawInstance {
 class RawImmutableArray : public RawArray {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ImmutableArray);
 
+  friend class HeapTrace;
   friend class SnapshotReader;
 };