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

tools/telemetry/telemetry/user_story/user_story_runner.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 optparse
 import os
 import random
 import sys
 import time
@@ skipping 178 matching lines @@
 
 
 def Run(test, user_story_set, expectations, finder_options, results,
         max_failures=None):
   """Runs a given test against a given page_set with the given options.
 
   Stop execution for unexpected exceptions such as KeyboardInterrupt.
   We "white list" certain exceptions for which the user story runner
   can continue running the remaining user stories.
   """
-  test.ValidatePageSet(user_story_set)
+  # TODO(slamm): Remove special-case for PageTest. https://crbug.com/440101
+  if isinstance(test, page_test.PageTest):
+    test.ValidatePageSet(user_story_set)
 
   # Reorder page set based on options.
   user_stories = _ShuffleAndFilterUserStorySet(user_story_set, finder_options)
 
   if (not finder_options.use_live_sites and
       finder_options.browser_options.wpr_mode != wpr_modes.WPR_RECORD):
     _UpdateUserStoryArchivesIfChanged(user_story_set)
     if not _CheckArchives(
         user_story_set.archive_data_file, user_story_set.wpr_archive_info,
         user_stories):
       return
 
-  for user_story in list(user_stories):
-    if not test.CanRunForPage(user_story):
-      results.WillRunPage(user_story)
-      logging.debug('Skipping test: it cannot run for %s',
-                    user_story.display_name)
-      results.AddValue(skip.SkipValue(user_story, 'Test cannot run'))
-      results.DidRunPage(user_story)
-      user_stories.remove(user_story)
+  # TODO(slamm): Remove special-case for PageTest. https://crbug.com/440101
+  if isinstance(test, page_test.PageTest):
+    for user_story in list(user_stories):
+      if not test.CanRunForPage(user_story):
+        results.WillRunPage(user_story)
+        logging.debug('Skipping test: it cannot run for %s',
+                      user_story.display_name)
+        results.AddValue(skip.SkipValue(user_story, 'Test cannot run'))
+        results.DidRunPage(user_story)
+        user_stories.remove(user_story)
 
   if not user_stories:
     return
 
   # Effective max failures gives priority to command-line flag value.
   effective_max_failures = finder_options.max_failures
   if effective_max_failures is None:
     effective_max_failures = max_failures
 
   user_story_groups = GetUserStoryGroupsWithSameSharedUserStoryClass(
@@ skipping 23 matching lines @@
                 # (The AppCrashException was saved as a failure value.)
                 state.TearDownState(results)
               finally:
                 # Later finally-blocks use state, so ensure it is cleared.
                 state = None
             finally:
               has_existing_exception = sys.exc_info() is not None
               try:
                 if state:
                   _CheckThermalThrottling(state.platform)
-                discard_run = (test.discard_first_result and
-                               user_story not in
-                               user_story_with_discarded_first_results)
-                if discard_run:
+                # TODO(slamm): Make discard_first_result part of user_story API.
+                # https://crbug.com/440101
+                discard_current_run = (
+                    getattr(test, 'discard_first_result', False) and
+                    user_story not in user_story_with_discarded_first_results)
+                if discard_current_run:
                   user_story_with_discarded_first_results.add(user_story)
-                results.DidRunPage(user_story, discard_run=discard_run)
+                results.DidRunPage(user_story, discard_run=discard_current_run)
               except Exception:
                 if not has_existing_exception:
                   raise
                 # Print current exception and propagate existing exception.
                 exception_formatter.PrintFormattedException(
                     msg='Exception from result processing:')
           if (effective_max_failures is not None and
               len(results.failures) > effective_max_failures):
             logging.error('Too many failures. Aborting.')
             return
@@ skipping 100 matching lines @@
     logging.warning('Device is thermally throttled before running '
                     'performance tests, results will vary.')
 
 
 def _CheckThermalThrottling(platform):
   if not platform.CanMonitorThermalThrottling():
     return
   if platform.HasBeenThermallyThrottled():
     logging.warning('Device has been thermally throttled during '
                     'performance tests, results will vary.')