Move user_story.user_story_set to story.story_set

tools/telemetry/telemetry/user_story/android/shared_app_state.py

Index: tools/telemetry/telemetry/user_story/android/shared_app_state.py
diff --git a/tools/telemetry/telemetry/user_story/android/shared_app_state.py b/tools/telemetry/telemetry/user_story/android/shared_app_state.py
index ef3924897305d3e7122f4d82e2da6b48a983e1f3..ccc0ea6b6c3c99f84972ef2ef4e64f93564a2be8 100644
--- a/tools/telemetry/telemetry/user_story/android/shared_app_state.py
+++ b/tools/telemetry/telemetry/user_story/android/shared_app_state.py
@@ -15,15 +15,15 @@ class SharedAppState(shared_state.SharedState):
   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(