A64: Synchronize with r18444.

src/heap-profiler.h

Index: src/heap-profiler.h
diff --git a/src/heap-profiler.h b/src/heap-profiler.h
index 3dd5b4d0e7d031034836f90c163a824236cb7924..e4838df1365be74bb5cde027a33946dcbc067f68 100644
--- a/src/heap-profiler.h
+++ b/src/heap-profiler.h
@@ -55,9 +55,11 @@ class HeapProfiler {
 
   void StartHeapObjectsTracking(bool track_allocations);
   void StopHeapObjectsTracking();
-  AllocationTracker* allocation_tracker() { return *allocation_tracker_; }
-  HeapObjectsMap* heap_object_map() { return *ids_; }
-  StringsStorage* names() { return *names_; }
+  AllocationTracker* allocation_tracker() const {
+    return allocation_tracker_.get();
+  }
+  HeapObjectsMap* heap_object_map() const { return ids_.get(); }
+  StringsStorage* names() const { return names_.get(); }
 
   SnapshotObjectId PushHeapObjectsStats(OutputStream* stream);
   int GetSnapshotsCount();
@@ -80,9 +82,12 @@ class HeapProfiler {
   void SetRetainedObjectInfo(UniqueId id, RetainedObjectInfo* info);
 
   bool is_tracking_object_moves() const { return is_tracking_object_moves_; }
-  bool is_tracking_allocations() { return !allocation_tracker_.is_empty(); }
+  bool is_tracking_allocations() const {
+    return !allocation_tracker_.is_empty();
+  }
 
   Handle<HeapObject> FindHeapObjectById(SnapshotObjectId id);
+  void ClearHeapObjectMap();
 
  private:
   Heap* heap() const { return ids_->heap(); }