Reland Plumb trace canonicalUrl through TelemetryInfo.

telemetry/telemetry/internal/results/csv_pivot_table_output_formatter_unittest.py

Index: telemetry/telemetry/internal/results/csv_pivot_table_output_formatter_unittest.py
diff --git a/telemetry/telemetry/internal/results/csv_pivot_table_output_formatter_unittest.py b/telemetry/telemetry/internal/results/csv_pivot_table_output_formatter_unittest.py
index 2fe1a0f17c872e70db970c5c87f9a4fa6d3756d1..8c14d7a17cf6bea1537eefa9e0361be7961964d3 100644
--- a/telemetry/telemetry/internal/results/csv_pivot_table_output_formatter_unittest.py
+++ b/telemetry/telemetry/internal/results/csv_pivot_table_output_formatter_unittest.py
@@ -79,8 +79,9 @@ class CsvPivotTableOutputFormatterTest(unittest.TestCase):
   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": []}'))
-    trace_value.UploadToCloud(bucket='foo')
+        None, trace_data.CreateTraceDataFromRawData('{"traceEvents": []}'),
+        remote_path='rp', upload_bucket='foo', cloud_url='http://google.com')
+    trace_value.UploadToCloud()
     self.SimulateBenchmarkRun([
         (self._story_set[0], [
             scalar.ScalarValue(
@@ -108,7 +109,7 @@ class CsvPivotTableOutputFormatterTest(unittest.TestCase):
     self.assertEquals(len(set((v[2] for v in values))), 4)  # 4 value names.
     self.assertEquals(values[2],
                       ['story_set', 'http://www.bar.com/', 'trace',
-                       'https://cloud_storage_url/foo', '', '1'])
+                       'http://google.com', '', '1'])
 
   def testTraceTag(self):
     self.MakeFormatter(trace_tag='date,option')