Revert of Rename Heap to ThreadHeap

tools/perf/measurements/oilpan_gc_times.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 from telemetry.page import action_runner
 from telemetry.page import page_test
 from telemetry.timeline.model import TimelineModel
 from telemetry.timeline import tracing_config
@@ skipping 54 matching lines @@
   # Parse trace events
   reason = None
   mark_time = 0
   lazy_sweep_time = 0
   complete_sweep_time = 0
   for event in events:
     duration = event.thread_duration or event.duration
     if event.name == 'ThreadHeap::coalesce':
       values['oilpan_coalesce'].append(duration)
       continue
-    if event.name == 'BlinkGCMarking':
+    if event.name == 'Heap::collectGarbage':
       if reason is not None:
         values['oilpan_%s_mark' % reason].append(mark_time)
         values['oilpan_%s_lazy_sweep' % reason].append(lazy_sweep_time)
         values['oilpan_%s_complete_sweep' % reason].append(complete_sweep_time)
 
       reason = GetGcReason(event, async_slices)
       mark_time = duration
       lazy_sweep_time = 0
       complete_sweep_time = 0
       continue
@@ skipping 110 matching lines @@
 
   def __init__(self):
     super(OilpanGCTimesForInternals, self).__init__()
 
   @classmethod
   def CustomizeBrowserOptions(cls, options):
     # 'expose-internals-for-testing' can be enabled on content shell.
     assert 'content-shell' in options.browser_type
     options.AppendExtraBrowserArgs(['--expose-internals-for-testing',
                                     '--js-flags=--expose-gc'])