Kill PageSet.AddPageWithDefaultRunNavigate.

tools/telemetry/telemetry/value/trace_unittest.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 os
 import unittest
 import shutil
 import tempfile
 
+from telemetry import page as page_module
 from telemetry.page import page_set
 from telemetry.timeline import tracing_timeline_data
 from telemetry.unittest_util import system_stub
 from telemetry.util import file_handle
 from telemetry.value import trace
 
 
 class TestBase(unittest.TestCase):
 
   def setUp(self):
-    self.page_set = page_set.PageSet(file_path=os.path.dirname(__file__))
-    self.page_set.AddPageWithDefaultRunNavigate('http://www.bar.com/')
-    self.page_set.AddPageWithDefaultRunNavigate('http://www.baz.com/')
-    self.page_set.AddPageWithDefaultRunNavigate('http://www.foo.com/')
+    ps = page_set.PageSet(file_path=os.path.dirname(__file__))
+    ps.AddUserStory(page_module.Page('http://www.bar.com/', ps, ps.base_dir))
+    ps.AddUserStory(page_module.Page('http://www.baz.com/', ps, ps.base_dir))
+    ps.AddUserStory(page_module.Page('http://www.foo.com/', ps, ps.base_dir))
+    self.page_set = ps
 
     self._cloud_storage_stub = system_stub.Override(trace, ['cloud_storage'])
 
   def tearDown(self):
     if self._cloud_storage_stub:
       self._cloud_storage_stub.Restore()
       self._cloud_storage_stub = None
 
   @property
   def pages(self):
@@ skipping 90 matching lines @@
     trace.cloud_storage.SetCalculatedHashesForTesting(
         TestDefaultDict(123))
     bucket = trace.cloud_storage.PUBLIC_BUCKET
     v.UploadToCloud(bucket)
     self.assertTrue(_IsEmptyDir(self.temp_test_dir))
 
   def tearDown(self):
     super(NoLeakedTempfilesTests, self).tearDown()
     shutil.rmtree(self.temp_test_dir)
     trace.tempfile.tempdir = self.actual_tempdir