Kill PageSet.AddPageWithDefaultRunNavigate.

tools/perf/benchmarks/dromaeo.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 math
 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.value import scalar
 
 
 class _DromaeoMeasurement(page_test.PageTest):
   def __init__(self):
     super(_DromaeoMeasurement, self).__init__()
     self._power_metric = None
 
@@ skipping 81 matching lines @@
     # Subclasses are expected to define class members called query_param and
     # tag.
     if not hasattr(self, 'query_param') or not hasattr(self, 'tag'):
       raise NotImplementedError('query_param or tag not in Dromaeo benchmark.')
     archive_data_file = '../page_sets/data/dromaeo.%s.json' % self.tag
     ps = page_set.PageSet(
         make_javascript_deterministic=False,
         archive_data_file=archive_data_file,
         file_path=os.path.abspath(__file__), bucket=page_set.PUBLIC_BUCKET)
     url = 'http://dromaeo.com?%s' % self.query_param
-    ps.AddPageWithDefaultRunNavigate(url)
+    ps.AddUserStory(page_module.Page(url, ps, ps.base_dir))
     return ps
 
 
 class DromaeoDomCoreAttr(_DromaeoBenchmark):
   """Dromaeo DOMCore attr JavaScript benchmark."""
   tag = 'domcoreattr'
   query_param = 'dom-attr'
 
 
 class DromaeoDomCoreModify(_DromaeoBenchmark):
@@ skipping 73 matching lines @@
   """Dromaeo JSLib traverse prototype JavaScript benchmark"""
   tag = 'jslibtraverseprototype'
   query_param = 'jslib-traverse-prototype'
 
 
 class DromaeoCSSQueryJquery(_DromaeoBenchmark):
   """Dromaeo CSS Query jquery JavaScript benchmark"""
   tag = 'cssqueryjquery'
   query_param = 'cssquery-jquery'