Revert of Plumb trace canonicalUrl through TelemetryInfo.

telemetry/telemetry/value/trace_unittest.py

Index: telemetry/telemetry/value/trace_unittest.py
diff --git a/telemetry/telemetry/value/trace_unittest.py b/telemetry/telemetry/value/trace_unittest.py
index 2829c2c0b40452d65a367867d889629c9aaf5d5d..9623140b80bcaca160f24253bcc0edf407390c47 100644
--- a/telemetry/telemetry/value/trace_unittest.py
+++ b/telemetry/telemetry/value/trace_unittest.py
@@ -77,40 +77,48 @@
 
     self.assertEquals('TraceValue(http://www.bar.com/, trace)', str(v))
 
+  def testTraceSerializationContainStoryName(self):
+    tempdir = tempfile.mkdtemp()
+    try:
+      v = trace.TraceValue(self.pages[0],
+                           trace_data.CreateTraceDataFromRawData([{'test': 1}]))
+      fh = v.Serialize(tempdir)
+      self.assertTrue(os.path.basename(fh.GetAbsPath()).startswith(
+          'http___www_bar_com'))
+    finally:
+      shutil.rmtree(tempdir)
+
   def testAsDictWhenTraceSerializedAndUploaded(self):
     tempdir = tempfile.mkdtemp()
     try:
-      bucket = trace.cloud_storage.PUBLIC_BUCKET
-      v = trace.TraceValue(
-          self.pages[0], trace_data.CreateTraceDataFromRawData([{'test': 1}]),
-          file_path=os.path.join(tempdir, 'trace.html'),
-          upload_bucket=bucket,
-          cloud_url='cloud_url')
-      fh = v.Serialize()
+      v = trace.TraceValue(None,
+                           trace_data.CreateTraceDataFromRawData([{'test': 1}]))
+      fh = v.Serialize(tempdir)
       # pylint: disable=no-member
       trace.cloud_storage.SetCalculatedHashesForTesting(
           {fh.GetAbsPath(): 123})
       # pylint: enable=no-member
-      v.UploadToCloud()
+      bucket = trace.cloud_storage.PUBLIC_BUCKET
+      cloud_url = v.UploadToCloud(bucket)
       d = v.AsDict()
       self.assertEqual(d['file_id'], fh.id)
-      self.assertEqual(d['cloud_url'], 'cloud_url')
+      self.assertEqual(d['cloud_url'], cloud_url)
     finally:
       shutil.rmtree(tempdir)
 
   def testAsDictWhenTraceIsNotSerializedAndUploaded(self):
     test_temp_file = tempfile.NamedTemporaryFile(delete=False)
     try:
+      v = trace.TraceValue(None,
+                           trace_data.CreateTraceDataFromRawData([{'test': 1}]))
+      # pylint: disable=no-member
+      trace.cloud_storage.SetCalculatedHashesForTesting(
+          TestDefaultDict(123))
+      # pylint: enable=no-member
       bucket = trace.cloud_storage.PUBLIC_BUCKET
-      v = trace.TraceValue(
-          None, trace_data.CreateTraceDataFromRawData([{'test': 1}]),
-          upload_bucket=bucket, cloud_url='cloud_url')
-      # pylint: disable=no-member
-      trace.cloud_storage.SetCalculatedHashesForTesting(TestDefaultDict(123))
-      # pylint: enable=no-member
-      v.UploadToCloud()
+      cloud_url = v.UploadToCloud(bucket)
       d = v.AsDict()
-      self.assertEqual(d['cloud_url'], 'cloud_url')
+      self.assertEqual(d['cloud_url'], cloud_url)
     finally:
       if os.path.exists(test_temp_file.name):
         test_temp_file.close()