Move user_story.user_story_set to story.story_set

tools/telemetry/telemetry/results/user_story_run_unittest.py

Index: tools/telemetry/telemetry/results/user_story_run_unittest.py
diff --git a/tools/telemetry/telemetry/results/user_story_run_unittest.py b/tools/telemetry/telemetry/results/user_story_run_unittest.py
index e9d7823c1105cf5d3f253d8681349d9a522d868c..c4be99c9d73b0eeb48824e8b315103c8fc3222f3 100644
--- a/tools/telemetry/telemetry/results/user_story_run_unittest.py
+++ b/tools/telemetry/telemetry/results/user_story_run_unittest.py
@@ -6,8 +6,8 @@ import unittest
 
 from telemetry.results import user_story_run
 from telemetry.story import shared_state
+from telemetry.story import story_set
 from telemetry import user_story as user_story_module
-from telemetry.user_story import user_story_set
 from telemetry.value import failure
 from telemetry.value import scalar
 from telemetry.value import skip
@@ -24,12 +24,12 @@ class UserStoryFoo(user_story_module.UserStory):
 
 class UserStoryRunTest(unittest.TestCase):
   def setUp(self):
-    self.user_story_set = user_story_set.UserStorySet()
-    self.user_story_set.AddUserStory(UserStoryFoo())
+    self.story_set = story_set.StorySet()

[nednguyen, 2015/05/04 23:30:24]

... = story.StorySet()

[aiolos (Not reviewing), 2015/05/09 03:53:59]

Done.

+    self.story_set.AddUserStory(UserStoryFoo())
 
   @property
   def user_stories(self):
-    return self.user_story_set.user_stories
+    return self.story_set.user_stories
 
   def testUserStoryRunFailed(self):
     run = user_story_run.UserStoryRun(self.user_stories[0])