Get rid of PageSet.FromDict from unittests

tools/perf/measurements/timeline_based_measurement_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
 
 from measurements import timeline_based_measurement as tbm_module
 from metrics import timeline_based_metric
 from telemetry.core import wpr_modes
@@ skipping 59 matching lines @@
       res = []
       if interaction.is_smooth:
         res.append(FakeSmoothMetric())
       if interaction.is_loading_resources:
         res.append(FakeLoadingMetric())
       return res
 
     metric = tbm_module._TimelineBasedMetrics( # pylint: disable=W0212
         self.model, self.renderer_thread,
         CreateMetricsForTimelineInteractionRecord)
-    ps = page_set.PageSet.FromDict({
-      "description": "hello",
-      "archive_path": "foo.wpr",
-      "pages": [
-        {"url": "http://www.bar.com/"}
-      ]
-    }, os.path.dirname(__file__))
+    ps = page_set.PageSet(file_path=os.path.dirname(__file__))
+    ps.AddPageWithDefaultRunNavigate('http://www.bar.com/')
+
     results.WillMeasurePage(ps.pages[0])
     metric.AddResults(results)
     results.DidMeasurePage()
 
     v = results.FindAllPageSpecificValuesNamed('LogicalName1-FakeSmoothMetric')
     self.assertEquals(len(v), 1)
     v = results.FindAllPageSpecificValuesNamed('LogicalName2-FakeLoadingMetric')
     self.assertEquals(len(v), 1)
 
 
@@ skipping 10 matching lines @@
                                         'javascript': 'window.animationDone'})
     measurement = tbm_module.TimelineBasedMeasurement()
     results = self.RunMeasurement(measurement, ps,
                                   options=self._options)
     self.assertEquals(0, len(results.failures))
     v = results.FindAllPageSpecificValuesNamed('CenterAnimation-jank')
     self.assertEquals(len(v), 1)
     v = results.FindAllPageSpecificValuesNamed('DrawerAnimation-jank')
     self.assertEquals(len(v), 1)