Revert of [Telemetry] Modify CreatePageSet to CreateStorySet

content/test/gpu/gpu_tests/trace_test.py

 # Copyright (c) 2015 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 page_sets
 import trace_test_expectations
 
 from telemetry import benchmark
 from telemetry.core.platform import tracing_category_filter
 from telemetry.core.platform import tracing_options
 from telemetry.page import page_test
@@ skipping 56 matching lines @@
     return TOPLEVEL_SERVICE_CATEGORY
 
 
 class _DeviceTraceValidator(_TraceValidatorBase):
   def GetCategoryName(self):
     return TOPLEVEL_DEVICE_CATEGORY
 
 
 class _TraceTestBase(benchmark.Benchmark):
   """Base class for the trace tests."""
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     # Utilize pixel tests page set as a set of simple pages to load.
     page_set = page_sets.PixelTestsPageSet(base_name=self.name)
     for page in page_set.pages:
       page.script_to_evaluate_on_commit = test_harness_script
     return page_set
 
 
 class TraceTest(_TraceTestBase):
   """Tests GPU traces are plumbed through properly."""
   test = _TraceValidator
@@ skipping 11 matching lines @@
   """Tests GPU Device traces show up on devices that support it."""
   test = _DeviceTraceValidator
   name = 'DeviceTraceTest'
 
   @classmethod
   def Name(cls):
     return 'device_trace_test'
 
   def CreateExpectations(self):
     return trace_test_expectations.DeviceTraceTestExpectations()