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

tools/perf/benchmarks/session_restore.py

 # Copyright 2013 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 os
 import tempfile
 
 from measurements import session_restore
 import page_sets
 from profile_creators import small_profile_creator
@@ skipping 18 matching lines @@
       if not os.path.exists(profile_dir):
         new_args = args.Copy()
         new_args.pageset_repeat = 1
         new_args.output_dir = output_dir
         profile_generator.GenerateProfiles(
             small_profile_creator.SmallProfileCreator, profile_type, new_args)
       args.browser_options.profile_dir = profile_dir
 
   def CreatePageTest(self, options):
     is_cold = (self.tag == 'cold')
-    return self.test(cold=is_cold)
+    return session_restore.SessionRestore(cold=is_cold)
 
 # crbug.com/325479, crbug.com/381990
 @benchmark.Disabled('android', 'linux', 'reference')
 class SessionRestoreColdTypical25(_SessionRestoreTest):
   tag = 'cold'
-  test = session_restore.SessionRestore
   page_set = page_sets.Typical25PageSet
   options = {'pageset_repeat': 5}
 
 
 # crbug.com/325479, crbug.com/381990
 @benchmark.Disabled('android', 'linux', 'reference')
 class SessionRestoreWarmTypical25(_SessionRestoreTest):
   tag = 'warm'
-  test = session_restore.SessionRestore
   page_set = page_sets.Typical25PageSet
   options = {'pageset_repeat': 20}