TimelineBasedMeasurement(object) instead of TimelineBasedMeasurement(page_test.PageTest)

tools/telemetry/telemetry/page/shared_page_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.
 import logging
 import os
 import sys
 
 from telemetry import decorators
 from telemetry.core import browser_finder
 from telemetry.core import browser_finder_exceptions
 from telemetry.core import browser_info
 from telemetry.core import exceptions
 from telemetry.core import util
 from telemetry.core import wpr_modes
 from telemetry.core.platform.profiler import profiler_finder
 from telemetry.page import page_test
 from telemetry.user_story import shared_user_story_state
 from telemetry.util import exception_formatter
 from telemetry.util import file_handle
 from telemetry.value import skip
+from telemetry.web_perf import timeline_based_measurement
 
 
 def _PrepareFinderOptions(finder_options, test, page_set):
   browser_options = finder_options.browser_options
   # Set up user agent.
   browser_options.browser_user_agent_type = page_set.user_agent_type or None
 
   test.CustomizeBrowserOptions(finder_options.browser_options)
   if finder_options.profiler:
     profiler_class = profiler_finder.FindProfiler(finder_options.profiler)
     profiler_class.CustomizeBrowserOptions(browser_options.browser_type,
                                            finder_options)
 
 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, user_story_set)
     self._finder_options = finder_options
     self._possible_browser = self._GetPossibleBrowser(test, finder_options)
 
     # TODO(slamm): Remove _append_to_existing_wpr when replay lifetime changes.
     self._append_to_existing_wpr = False
     self._first_browser = True
-    self._test = test
+    self._test = (
+        timeline_based_measurement.TimelineBasedPageTest(test)
+        if isinstance(test, timeline_based_measurement.TimelineBasedMeasurement)
+        else test)
     self._did_login_for_current_page = False
     self._current_page = None
     self._current_tab = None
 
     self._test.SetOptions(self._finder_options)
 
   def _GetPossibleBrowser(self, test, finder_options):
     ''' Return a possible_browser with the given options. '''
     possible_browser = browser_finder.FindBrowser(finder_options)
     if not possible_browser:
@@ skipping 214 matching lines @@
     self.platform.profiling_controller.Start(
         self._finder_options.profiler, output_file)
 
   def _StopProfiling(self, results):
     if self.browser:
       profiler_files = self.platform.profiling_controller.Stop()
       for f in profiler_files:
         if os.path.isfile(f):
           results.AddProfilingFile(self._current_page,
                                    file_handle.FromFilePath(f))