Revert of Plumb trace canonicalUrl through TelemetryInfo.

telemetry/telemetry/internal/results/csv_pivot_table_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 os
 import StringIO
 import unittest
 
 import mock
 
 from telemetry import story
@@ skipping 61 matching lines @@
         'story_set,page,name,value,units,run_index',
         'story_set,http://www.foo.com/,foo,3,seconds,0',
         ''])
 
     self.assertEqual(expected, self.Format())
 
   @mock.patch('py_utils.cloud_storage.Insert')
   def testMultiplePagesAndValues(self, cs_insert_mock):
     cs_insert_mock.return_value = 'https://cloud_storage_url/foo'
     trace_value = trace.TraceValue(
-        None, trace_data.CreateTraceDataFromRawData('{"traceEvents": []}'),
-        remote_path='rp', upload_bucket='foo',
-        cloud_url='https://cloud_storage_url/foo')
-    trace_value.UploadToCloud()
+        None, trace_data.CreateTraceDataFromRawData('{"traceEvents": []}'))
+    trace_value.UploadToCloud(bucket='foo')
     self.SimulateBenchmarkRun([
         (self._story_set[0], [
             scalar.ScalarValue(
                 None, 'foo', 'seconds', 4,
                 improvement_direction=improvement_direction.DOWN)]),
         (self._story_set[1], [
             scalar.ScalarValue(
                 None, 'foo', 'seconds', 3.4,
                 improvement_direction=improvement_direction.DOWN),
             trace_value,
@@ skipping 24 matching lines @@
                 None, 'foo', 'seconds', 3,
                 improvement_direction=improvement_direction.DOWN),
             scalar.ScalarValue(
                 None, 'bar', 'tons', 5,
                 improvement_direction=improvement_direction.DOWN)])])
     output = self.Format().split(self._LINE_SEPARATOR)
 
     self.assertTrue(output[0].endswith(',trace_tag_0,trace_tag_1'))
     for line in output[1:-1]:
       self.assertTrue(line.endswith(',date,option'))