Revert of [Telemetry] Modify CreatePageSet to CreateStorySet

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.core import util
 from telemetry.internal.results import page_test_results
 from telemetry.page import page as page_module
 from telemetry.timeline import model
@@ skipping 138 matching lines @@
     self.assertEquals(1, len(getMetric(results, 'oilpan_forced_mark')))
     self.assertEquals(1, len(getMetric(results, 'oilpan_forced_lazy_sweep')))
     self.assertEquals(1, len(getMetric(results,
                                        'oilpan_forced_complete_sweep')))
     self.assertEquals(2, len(getMetric(results, 'oilpan_idle_mark')))
     self.assertEquals(2, len(getMetric(results, 'oilpan_idle_lazy_sweep')))
     self.assertEquals(2, len(getMetric(results,
                                        'oilpan_idle_complete_sweep')))
 
   def testForSmoothness(self):
-    ps = self.CreateStorySetFromFileInUnittestDataDir(
-        'create_many_objects.html')
+    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 = results.FindAllPageSpecificValuesNamed('oilpan_precise_mark')
     conservative = results.FindAllPageSpecificValuesNamed(
         'oilpan_conservative_mark')
     self.assertLess(0, len(precise) + len(conservative))
 
   def testForBlinkPerf(self):
-    ps = self.CreateStorySetFromFileInUnittestDataDir(
-        'create_many_objects.html')
+    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 = results.FindAllPageSpecificValuesNamed('oilpan_precise_mark')
     conservative = results.FindAllPageSpecificValuesNamed(
         'oilpan_conservative_mark')
     self.assertLess(0, len(precise) + len(conservative))
 
   def _GenerateDataForEmptyPageSet(self):
@@ skipping 96 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