Call test methods from shared_app_state

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 80825271e4e61d6c1901341e547bb11fe37437b7..d0ce0e4f45408fb1e000b9c983f4097ad607904f 100644
--- a/tools/telemetry/telemetry/user_story/android/shared_app_state.py
+++ b/tools/telemetry/telemetry/user_story/android/shared_app_state.py
@@ -11,8 +11,6 @@ from telemetry.user_story import shared_user_story_state
 from telemetry.web_perf import timeline_based_measurement
 
 
-# TODO(slamm): Interact with TimelineBasedMeasurement when it no longer
-# depends on browser logic.
 class SharedAppState(shared_user_story_state.SharedUserStoryState):
   """Manage test state/transitions across multiple android.UserStory's.
 
@@ -34,6 +32,7 @@ class SharedAppState(shared_user_story_state.SharedUserStoryState):
         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
@@ -53,21 +52,31 @@ class SharedAppState(shared_user_story_state.SharedUserStoryState):
 
   def WillRunUserStory(self, user_story):
     assert not self._android_app
+    tracing_controller = self._android_platform.tracing_controller
+    self._test.WillRunUserStory(tracing_controller)
     self._current_user_story = user_story
     self._android_app = self._android_platform.LaunchAndroidApplication(
         user_story.start_intent, user_story.is_app_ready_predicate)
 
   def RunUserStory(self, results):
     self._current_user_story.Run(self)
+    tracing_controller = self._android_platform.tracing_controller
+    self._test.Measure(tracing_controller, results)
 
   def DidRunUserStory(self, results):
+    tracing_controller = self._android_platform.tracing_controller
+    self._test.WillDidRunUserStory(tracing_controller)

[nednguyen, 2015/01/13 21:26:09]

self._test.DidRunUserStory(..)

     if self._android_app:
       self._android_app.Close()
       self._android_app = None
 
   def GetTestExpectationAndSkipValue(self, expectations):
-    # TODO(chrishenry): Implement this properly.
+    """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