Revert of Rename Heap to ThreadHeap

tools/perf/measurements/oilpan_gc_times_unittest.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.
 
 from measurements import oilpan_gc_times
 
 from telemetry.internal.results import page_test_results
 from telemetry.page import page as page_module
 from telemetry.testing import options_for_unittests
 from telemetry.testing import page_test_test_case
@@ skipping 57 matching lines @@
     self._results = page_test_results.PageTestResults()
 
 
 class OilpanGCTimesTest(page_test_test_case.PageTestTestCase):
   """Smoke test for Oilpan GC pause time measurements.
 
      Runs OilpanGCTimes measurement on some simple pages and verifies
      that all metrics were added to the results.  The test is purely functional,
      i.e. it only checks if the metrics are present and non-zero.
   """
-  _KEY_MARK = 'BlinkGCMarking'
+  _KEY_MARK = 'Heap::collectGarbage'
   _KEY_LAZY_SWEEP = 'ThreadHeap::lazySweepPages'
   _KEY_COMPLETE_SWEEP = 'ThreadState::completeSweep'
   _KEY_COALESCE = 'ThreadHeap::coalesce'
   _KEY_MEASURE = 'BlinkGCTimeMeasurement'
   # Do not add 'forced' in reasons to measure.
   _GC_REASONS = ['precise', 'conservative', 'idle']
 
   def setUp(self):
     self._options = options_for_unittests.GetCopy()
 
@@ skipping 195 matching lines @@
     data.AddSlice(self._KEY_COMPLETE_SWEEP, 862, 42, {})
     data.AddSlice(self._KEY_MARK, 904, 43,
                   {'lazySweeping': False, 'gcReason': 'IdleGC'})
     last_measure = data.AddSlice(self._KEY_COMPLETE_SWEEP, 947, 44, {})
 
     # Async event
     async_dur = last_measure.end - first_measure.start
     data.AddAsyncSlice(self._KEY_MEASURE, first_measure.start, async_dur, {})
 
     return data