[Oilpan] Count all GC marking events in tests

tools/perf/measurements/oilpan_gc_times_unittest.py

Index: tools/perf/measurements/oilpan_gc_times_unittest.py
diff --git a/tools/perf/measurements/oilpan_gc_times_unittest.py b/tools/perf/measurements/oilpan_gc_times_unittest.py
index e2333dc0f44333e9c157bd488c30f088d0e770e0..ae359758d27c9db6134da4adb7f6fb445c8732b5 100644
--- a/tools/perf/measurements/oilpan_gc_times_unittest.py
+++ b/tools/perf/measurements/oilpan_gc_times_unittest.py
@@ -3,8 +3,6 @@
 # found in the LICENSE file.
 
 from measurements import oilpan_gc_times
-from telemetry import decorators
-from telemetry.core import wpr_modes
 from telemetry.unittest_util import options_for_unittests
 from telemetry.unittest_util import page_test_test_case
 
@@ -18,22 +16,24 @@ class OilpanGCTimesTest(page_test_test_case.PageTestTestCase):
   def setUp(self):
     self._options = options_for_unittests.GetCopy()
 
-  @decorators.Disabled
   def testForSmoothness(self):
     ps = self.CreatePageSetFromFileInUnittestDataDir('create_many_objects.html')
     measurement = oilpan_gc_times.OilpanGCTimesForSmoothness()
     results = self.RunMeasurement(measurement, ps, options=self._options)
     self.assertEquals(0, len(results.failures))
 
-    precise_mark = results.FindAllPageSpecificValuesNamed('oilpan_precise_mark')
-    self.assertLess(0, len(precise_mark))
+    precise = results.FindAllPageSpecificValuesNamed('oilpan_precise_mark')
+    conservative = results.FindAllPageSpecificValuesNamed(
+        'oilpan_conservative_mark')
+    self.assertLess(0, len(precise) + len(conservative))
 
-  @decorators.Disabled
   def testForBlinkPerf(self):
     ps = self.CreatePageSetFromFileInUnittestDataDir('create_many_objects.html')
     measurement = oilpan_gc_times.OilpanGCTimesForBlinkPerf()
     results = self.RunMeasurement(measurement, ps, options=self._options)
     self.assertEquals(0, len(results.failures))
 
-    precise_mark = results.FindAllPageSpecificValuesNamed('oilpan_precise_mark')
-    self.assertLess(0, len(precise_mark))
+    precise = results.FindAllPageSpecificValuesNamed('oilpan_precise_mark')
+    conservative = results.FindAllPageSpecificValuesNamed(
+        'oilpan_conservative_mark')
+    self.assertLess(0, len(precise) + len(conservative))