Revert of Plumb trace canonicalUrl through TelemetryInfo.

telemetry/telemetry/web_perf/timeline_based_measurement.py

Index: telemetry/telemetry/web_perf/timeline_based_measurement.py
diff --git a/telemetry/telemetry/web_perf/timeline_based_measurement.py b/telemetry/telemetry/web_perf/timeline_based_measurement.py
index 8345896527f1fa4dca1da70b40d69ff3a3921862..87a51f90685daad8473325b4a8dc3e46f081511c 100644
--- a/telemetry/telemetry/web_perf/timeline_based_measurement.py
+++ b/telemetry/telemetry/web_perf/timeline_based_measurement.py
@@ -279,12 +279,7 @@
     """Collect all possible metrics and added them to results."""
     platform.tracing_controller.telemetry_info = results.telemetry_info
     trace_result = platform.tracing_controller.StopTracing()
-    trace_value = trace.TraceValue(
-        results.current_page, trace_result,
-        file_path=results.telemetry_info.trace_local_path,
-        remote_path=results.telemetry_info.trace_remote_path,
-        upload_bucket=results.telemetry_info.upload_bucket,
-        cloud_url=results.telemetry_info.trace_remote_url)
+    trace_value = trace.TraceValue(results.current_page, trace_result)
     results.AddValue(trace_value)
 
     try:
@@ -309,12 +304,7 @@
     """Clean up after running the story."""
     if platform.tracing_controller.is_tracing_running:
       trace_result = platform.tracing_controller.StopTracing()
-      trace_value = trace.TraceValue(
-          results.current_page, trace_result,
-          file_path=results.telemetry_info.trace_local_path,
-          remote_path=results.telemetry_info.trace_remote_path,
-          upload_bucket=results.telemetry_info.upload_bucket,
-          cloud_url=results.telemetry_info.trace_remote_url)
+      trace_value = trace.TraceValue(results.current_page, trace_result)
       results.AddValue(trace_value)
 
   def _ComputeTimelineBasedMetrics(self, results, trace_value):
@@ -326,7 +316,7 @@
     start = time.time()
     mre_result = metric_runner.RunMetric(
         trace_value.filename, metrics, extra_import_options,
-        report_progress=False, canonical_url=results.telemetry_info.trace_url)
+        report_progress=False)
     logging.warning('Processing resulting traces took %.3f seconds' % (
         time.time() - start))
     page = results.current_page