[RPP] Don't save traces with scripts with name "EnhancedTrace"

Don't save with a different name based on presence of scripts.

Bug: 427455148
Change-Id: I3c436be3e8fc90562e92e1375b826b750014da31
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7046626
Auto-Submit: Connor Clark <[email protected]>
Reviewed-by: Paul Irish <[email protected]>
Commit-Queue: Connor Clark <[email protected]>

Author: Connor Clark

front_end/panels/timeline/TimelinePanel.test.ts

@@ -372,7 +372,7 @@ describeWithEnvironment('TimelinePanel', function() {
         sinon.assert.calledOnce(closeSpy);
 
         const [fileName, contentData] = saveSpy.getCall(0).args;
-        assert.match(fileName, /EnhancedTrace-[\d|T]+\.json\.gz$/);
+        assert.match(fileName, /Trace-[\d|T]+\.json\.gz$/);
 
         const file = await contentDataToFile(contentData);
         assert.isDefined(file.metadata.enhancedTraceVersion);
@@ -392,7 +392,7 @@ describeWithEnvironment('TimelinePanel', function() {
         sinon.assert.calledOnce(closeSpy);
 
         const [fileName, contentData] = saveSpy.getCall(0).args;
-        assert.match(fileName, /EnhancedTrace-[\d|T]+\.json\.gz$/);
+        assert.match(fileName, /Trace-[\d|T]+\.json\.gz$/);
 
         const file = await contentDataToFile(contentData);
         assert.isDefined(file.metadata.enhancedTraceVersion);
@@ -484,7 +484,7 @@ describeWithEnvironment('TimelinePanel', function() {
         sinon.assert.calledOnce(closeSpy);
 
         const [fileName, contentData] = saveSpy.getCall(0).args;
-        assert.match(fileName, /EnhancedTrace-[\d|T]+\.json$/);
+        assert.match(fileName, /Trace-[\d|T]+\.json$/);
 
         const file = await contentDataToFile(contentData);
         assert.isDefined(file.metadata.enhancedTraceVersion);
@@ -527,7 +527,7 @@ describeWithEnvironment('TimelinePanel', function() {
         sinon.assert.calledOnce(closeSpy);
 
         const [fileName, contentData] = saveSpy.getCall(0).args;
-        assert.match(fileName, /EnhancedTrace-[\d|T]+\.json$/);
+        assert.match(fileName, /Trace-[\d|T]+\.json$/);
 
         const file = await contentDataToFile(contentData);
         assert.isDefined(file.metadata.enhancedTraceVersion);

front_end/panels/timeline/TimelinePanel.ts

@@ -1468,9 +1468,8 @@ export class TimelinePanel extends Common.ObjectWrapper.eventMixin<EventTypes, t
     metadata.enhancedTraceVersion =
         includeScriptContent ? SDK.EnhancedTracesParser.EnhancedTracesParser.enhancedTraceVersion : undefined;
 
-    let fileName = (isCpuProfile ? `CPU-${isoDate}.cpuprofile` :
-                        includeScriptContent ? `EnhancedTrace-${isoDate}.json` :
-                                               `Trace-${isoDate}.json`) as Platform.DevToolsPath.RawPathString;
+    let fileName =
+        (isCpuProfile ? `CPU-${isoDate}.cpuprofile` : `Trace-${isoDate}.json`) as Platform.DevToolsPath.RawPathString;
 
     let blobParts: string[] = [];
     if (isCpuProfile) {