Move user_story.user_story_set to story.story_set

tools/telemetry/telemetry/benchmark.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 logging
 import optparse
 import os
 import shutil
 import sys
 import zipfile
@@ skipping 40 matching lines @@
       return self._rerun_options
 
 
 class Benchmark(command_line.Command):
   """Base class for a Telemetry benchmark.
 
   A benchmark packages a measurement and a PageSet together.
   Benchmarks default to using TBM unless you override the value of
   Benchmark.test, or override the CreatePageTest method.
 
-  New benchmarks should override CreateUserStorySet.
+  New benchmarks should override CreateStorySet.
   """
   options = {}
   test = timeline_based_measurement.TimelineBasedMeasurement
 
   def __init__(self, max_failures=None):
     """Creates a new Benchmark.
 
     Args:
       max_failures: The number of user story run's failures before bailing
           from executing subsequent page runs. If None, we never bail.
@@ skipping 105 matching lines @@
     pt.__name__ = self.__class__.__name__
 
     if hasattr(self, '_disabled_strings'):
       # pylint: disable=protected-access
       pt._disabled_strings = self._disabled_strings
     if hasattr(self, '_enabled_strings'):
       # pylint: disable=protected-access
       pt._enabled_strings = self._enabled_strings
 
     expectations = self.CreateExpectations()
-    us = self.CreateUserStorySet(finder_options)
+    us = self.CreateStorySet(finder_options)
     if isinstance(pt, page_test.PageTest):
       if any(not isinstance(p, page.Page) for p in us.user_stories):
         raise Exception(
-            'PageTest must be used with UserStorySet containing only '
+            'PageTest must be used with StorySet containing only '
             'telemetry.page.Page user stories.')
 
     self._DownloadGeneratedProfileArchive(finder_options)
 
     benchmark_metadata = self.GetMetadata()
     with results_options.CreateResults(
         benchmark_metadata, finder_options,
         self.ValueCanBeAddedPredicate) as results:
       try:
         story_runner.Run(pt, us, expectations, finder_options, results,
@@ skipping 118 matching lines @@
 
     By default, it will create a page set from the this test's page_set
     attribute. Override to generate a custom page set.
     """
     if not hasattr(self, 'page_set'):
       raise NotImplementedError('This test has no "page_set" attribute.')
     if not issubclass(self.page_set, page_set.PageSet):
       raise TypeError('"%s" is not a PageSet.' % self.page_set.__name__)
     return self.page_set()
 
-  def CreateUserStorySet(self, options):
+  def CreateStorySet(self, options):
     return self.CreatePageSet(options)
 
   @classmethod
   def CreateExpectations(cls):
     """Get the expectations this test will run with.
 
     By default, it will create an empty expectations set. Override to generate
     custom expectations.
     """
     return test_expectations.TestExpectations()
 
 
 def AddCommandLineArgs(parser):
   story_runner.AddCommandLineArgs(parser)
 
 
 def ProcessCommandLineArgs(parser, args):
   story_runner.ProcessCommandLineArgs(parser, args)