[Telemetry] Introduce shared_user_story_state for real.

tools/telemetry/telemetry/page/shared_page_state.py

Index: tools/telemetry/telemetry/page/shared_page_state.py
diff --git a/tools/telemetry/telemetry/page/shared_page_state.py b/tools/telemetry/telemetry/page/shared_page_state.py
index b02bba84b347ded95699d45f99b0d9cb5c3742d6..8955454ac82dc74cc31d335d4f3c04d36cc9533b 100644
--- a/tools/telemetry/telemetry/page/shared_page_state.py
+++ b/tools/telemetry/telemetry/page/shared_page_state.py
@@ -12,6 +12,7 @@ from telemetry.core import browser_info
 from telemetry.core import util
 from telemetry.core import wpr_modes
 from telemetry.page import page_test
+from telemetry.user_story import shared_user_story_state
 from telemetry.util import file_handle
 from telemetry.value import skip
 from telemetry.core.platform.profiler import profiler_finder
@@ -28,10 +29,11 @@ def _PrepareFinderOptions(finder_options, test, page_set):
     profiler_class.CustomizeBrowserOptions(browser_options.browser_type,
                                            finder_options)
 
-class SharedPageState(object):
-  def __init__(self, test, finder_options, page_set):
+class SharedPageState(shared_user_story_state.SharedUserStoryState):
+  def __init__(self, test, finder_options, user_story_set):
+    super(SharedPageState, self).__init__(test, finder_options, user_story_set)
     self.browser = None
-    _PrepareFinderOptions(finder_options, test, page_set)
+    _PrepareFinderOptions(finder_options, test, user_story_set)
     self._finder_options = finder_options
     self._possible_browser = self._GetPossibleBrowser(test, finder_options)
 
@@ -64,7 +66,7 @@ class SharedPageState(object):
       sys.exit(0)
     return possible_browser
 
-  def DidRunPage(self, results):
+  def DidRunUserStory(self, results):
     if self._finder_options.profiler:
       self._StopProfiling(results)
     util.CloseConnections(self._current_tab)
@@ -103,7 +105,8 @@ class SharedPageState(object):
         archive_path, wpr_mode, browser_options.netsim,
         browser_options.extra_wpr_args, make_javascript_deterministic)
 
-  def WillRunPage(self, page, page_set):
+  def WillRunUserStory(self, page):
+    page_set = page.page_set
     self._current_page = page
     if self._test.RestartBrowserBeforeEachPage() or page.startup_url:
       self._StopBrowser()
@@ -178,7 +181,7 @@ class SharedPageState(object):
     if self._finder_options.profiler:
       self._StartProfiling(self._current_page)
 
-  def GetPageExpectationAndSkipValue(self, expectations):
+  def GetTestExpectationAndSkipValue(self, expectations):
     skip_value = None
     if not self._current_page.CanRunOnBrowser(
         browser_info.BrowserInfo(self.browser)):
@@ -220,14 +223,15 @@ class SharedPageState(object):
     self._test.RunNavigateSteps(self._current_page, self._current_tab)
     self._test.DidNavigateToPage(self._current_page, self._current_tab)
 
-  def RunPage(self, results):
+  def RunUserStory(self, results):
     self._PreparePage()
     self._ImplicitPageNavigation()
     self._test.RunPage(self._current_page, self._current_tab, results)
 
-  def TearDown(self, results):
-    # NOTE: this is a HACK to get page_runner to be generic enough for any
-    # user_story. Other SharedUserStory should not call DidRunTest this way.
+  def TearDownState(self, results):
+    # NOTE: this is a HACK to get user_story_runner to be generic enough for any
+    # user_story while maintaing existing usecases of page tests. Other
+    # SharedUserStory should not call DidRunTest this way.
     self._test.DidRunTest(self.browser, results)
     self._StopBrowser()