Move user_story.user_story_set to story.story_set

tools/telemetry/telemetry/user_story/android/shared_app_state.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 telemetry.core import platform
 from telemetry.core.platform import android_device
 from telemetry.core.platform import android_platform
 from telemetry.story import shared_state
 from telemetry.web_perf import timeline_based_measurement
 
 
 class SharedAppState(shared_state.SharedState):
   """Manage test state/transitions across multiple android.UserStory's.
 
   WARNING: the class is not ready for public consumption.
   Email telemetry@chromium.org if you feel like you must use it.
   """
 
-  def __init__(self, test, finder_options, user_story_set):
+  def __init__(self, test, finder_options, story_set):
     """This method is styled on unittest.TestCase.setUpClass.
 
     Args:
       test: a web_perf.TimelineBasedMeasurement instance.
       options: a BrowserFinderOptions instance with command line options.
-      user_story_set: an android.UserStorySet instance.
+      story_set: an android.StorySet instance.

[nednguyen, 2015/05/12 15:39:49]

a story.StorySet instance

[aiolos (Not reviewing), 2015/05/12 20:45:32]

This will fail during WillRunUserStory if a story.UserStory is passed in since
it doesn't have the attributes that we assume in this class. (start_intent for
example.)

[nednguyen, 2015/05/13 20:15:35]

Ah, I forgot about this. Silly me, please ignore this comment.

     """
-    super(SharedAppState, self).__init__(test, finder_options, user_story_set)
+    super(SharedAppState, self).__init__(test, finder_options, story_set)
     if not isinstance(
         test, timeline_based_measurement.TimelineBasedMeasurement):
       raise ValueError(
           'SharedAppState only accepts TimelineBasedMeasurement tests'
           ' (not %s).' % test.__class__)
     self._test = test
     self._finder_options = finder_options
     self._android_app = None
     self._current_user_story = None
     self._android_platform = platform.GetPlatformForDevice(
@@ skipping 30 matching lines @@
   def GetTestExpectationAndSkipValue(self, expectations):
     """This does not apply to android app user stories."""
     return 'pass', None
 
   def TearDownState(self, results):
     """Tear down anything created in the __init__ method that is not needed.
 
     Currently, there is no clean-up needed from SharedAppState.__init__.
     """
     pass