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

runtime/vm/heap_profiler.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/heap_profiler.h"
 
 #include "vm/dart_api_state.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 #include "vm/stack_frame.h"
@@ skipping 95 matching lines @@
 void HeapProfiler::SubRecord::Write64(uint64_t value) {
   record_->Write64(value);
 }
 
 
 void HeapProfiler::SubRecord::WritePointer(const void* value) {
   record_->WritePointer(value);
 }
 
 
-HeapProfiler::HeapProfiler(Dart_HeapProfileWriteCallback callback, void* stream)
+HeapProfiler::HeapProfiler(Dart_FileWriteCallback callback, void* stream)
     : write_callback_(callback),
       output_stream_(stream),
       heap_dump_record_(NULL) {
   WriteHeader();
   WriteStackTrace();
   heap_dump_record_ = new Record(kHeapDump, this);
 }
 
 
 HeapProfiler::~HeapProfiler() {
@@ skipping 575 matching lines @@
   RawObject* raw_obj = handle->raw();
   visitor_->VisitPointer(&raw_obj);
 }
 
 
 void HeapProfilerObjectVisitor::VisitObject(RawObject* raw_obj) {
   profiler_->WriteObject(raw_obj);
 }
 
 }  // namespace dart