Kill PageSet.AddPageWithDefaultRunNavigate.

tools/perf/benchmarks/octane.py

 # Copyright 2012 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 Octane 2.0 javascript benchmark.
 
 Octane 2.0 is a modern benchmark that measures a JavaScript engine's performance
 by running a suite of tests representative of today's complex and demanding web
 applications. Octane's goal is to measure the performance of JavaScript code
 found in large, real-world web applications.
 Octane 2.0 consists of 17 tests, four more than Octane v1.
 """
 
 import os
 
 from metrics import power
 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 scalar
 
 _GB = 1024 * 1024 * 1024
 
 DESCRIPTIONS = {
   'CodeLoad':
       'Measures how quickly a JavaScript engine can start executing code '
@@ skipping 103 matching lines @@
 class Octane(benchmark.Benchmark):
   """Google's Octane JavaScript benchmark."""
   test = _OctaneMeasurement
 
   def CreatePageSet(self, options):
     ps = page_set.PageSet(
       archive_data_file='../page_sets/data/octane.json',
       make_javascript_deterministic=False,
       file_path=os.path.abspath(__file__),
       bucket=page_set.PUBLIC_BUCKET)
-    ps.AddPageWithDefaultRunNavigate(
-      'http://octane-benchmark.googlecode.com/svn/latest/index.html?auto=1')
+    ps.AddUserStory(page_module.Page(
+        'http://octane-benchmark.googlecode.com/svn/latest/index.html?auto=1',
+        ps, ps.base_dir))
     return ps