Kill PageSet.AddPageWithDefaultRunNavigate.

tools/perf/benchmarks/jetstream.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.
 
 """Runs Apple's JetStream benchmark.
 
 JetStream combines a variety of JavaScript benchmarks, covering a variety of
 advanced workloads and programming techniques, and reports a single score that
 balances them using geometric mean.
 
 Each benchmark measures a distinct workload, and no single optimization
 technique is sufficient to speed up all benchmarks. Latency tests measure that
 a web application can start up quickly, ramp up to peak performance quickly,
 and run smoothly without interruptions. Throughput tests measure the sustained
 peak performance of a web application, ignoring ramp-up time and spikes in
 smoothness. Some benchmarks demonstrate tradeoffs, and aggressive or
 specialized optimization for one benchmark might make another benchmark slower.
 """
 
 import json
 import os
 
 from telemetry import benchmark
+from telemetry import page as page_module
 from telemetry.page import page_set
 from telemetry.page import page_test
 from telemetry.util import statistics
 from telemetry.value import list_of_scalar_values
 
 
 class _JetstreamMeasurement(page_test.PageTest):
   def __init__(self):
     super(_JetstreamMeasurement, self).__init__()
 
@@ skipping 44 matching lines @@
 @benchmark.Disabled('android', 'xp')  # crbug.com/381742
 class Jetstream(benchmark.Benchmark):
   test = _JetstreamMeasurement
 
   def CreatePageSet(self, options):
     ps = page_set.PageSet(
         archive_data_file='../page_sets/data/jetstream.json',
         make_javascript_deterministic=False,
         file_path=os.path.abspath(__file__),
         bucket=page_set.INTERNAL_BUCKET)
-    ps.AddPageWithDefaultRunNavigate('http://browserbench.org/JetStream/')
+    ps.AddUserStory(page_module.Page(
+        'http://browserbench.org/JetStream/', ps, ps.base_dir))
     return ps