Revert of Plumb trace canonicalUrl through TelemetryInfo.

telemetry/telemetry/internal/results/json_output_formatter_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 json
 import os
 import shutil
 import StringIO
 import tempfile
 import unittest
 
@@ skipping 69 matching lines @@
     self.assertTrue(_HasPage(d['pages'], self._story_set[0]))
     self.assertTrue(_HasValueNamed(d['per_page_values'], 'foo'))
 
   def testAsDictWithTraceValue(self):
     tempdir = tempfile.mkdtemp()
     try:
       results = page_test_results.PageTestResults()
       results.WillRunPage(self._story_set[0])
       v0 = trace.TraceValue(
           results.current_page,
-          trace_data.CreateTraceDataFromRawData([{'event': 'test'}]),
-          file_path=os.path.join(tempdir, 'trace.html'))
+          trace_data.CreateTraceDataFromRawData([{'event': 'test'}]))
       results.AddValue(v0)
       results.DidRunPage(self._story_set[0])
-      results._SerializeTracesToDirPath()
+      results._SerializeTracesToDirPath(tempdir)
       d = json_output_formatter.ResultsAsDict(
           results, self._formatter.benchmark_metadata)
 
       self.assertTrue(_HasPage(d['pages'], self._story_set[0]))
       self.assertTrue(_HasValueNamed(d['per_page_values'], 'trace'))
       self.assertEquals(len(d['files']), 1)
       output_trace_path = d['files'].values()[0]
       self.assertTrue(output_trace_path.startswith(tempdir))
       self.assertTrue(os.path.exists(output_trace_path))
     finally:
@@ skipping 25 matching lines @@
     results = page_test_results.PageTestResults()
     v = scalar.ScalarValue(None, 'baz', 'seconds', 5,
                            improvement_direction=improvement_direction.DOWN)
     results.AddSummaryValue(v)
 
     d = json_output_formatter.ResultsAsDict(
         results, self._formatter.benchmark_metadata)
 
     self.assertFalse(d['pages'])
     self.assertTrue(_HasValueNamed(d['summary_values'], 'baz'))