Choose default trace name based on client.
The XHR client produces compressed traces, while the inspector doesn't. This is causing problems when capturing a trace from android devices, saving it, then loading the saved trace since the file is named with .gz but the contents aren't actually compressed.
BUG=1087
R=dsinclair@chromium.org
Review URL: https://codereview.appspot.com/252070043.
diff --git a/tracing/tracing/ui/extras/about_tracing/inspector_tracing_controller_client.html b/tracing/tracing/ui/extras/about_tracing/inspector_tracing_controller_client.html
index 86552b3..d105b63 100644
--- a/tracing/tracing/ui/extras/about_tracing/inspector_tracing_controller_client.html
+++ b/tracing/tracing/ui/extras/about_tracing/inspector_tracing_controller_client.html
@@ -172,6 +172,10 @@
}.bind(this),
tracingFailed.bind(this));
}.bind(this));
+ },
+
+ defaultTraceName: function() {
+ return 'trace.json';
}
};
diff --git a/tracing/tracing/ui/extras/about_tracing/profiling_view.html b/tracing/tracing/ui/extras/about_tracing/profiling_view.html
index 0a5c28f..79dc7f4 100644
--- a/tracing/tracing/ui/extras/about_tracing/profiling_view.html
+++ b/tracing/tracing/ui/extras/about_tracing/profiling_view.html
@@ -230,7 +230,9 @@
function(data) {
this.isRecording_ = false;
buttons.querySelector('#monitor-checkbox').disabled = false;
- this.setActiveTrace('trace.json.gz', data, false);
+ var traceName = tr.ui.e.about_tracing.defaultTraceName(
+ this.tracingControllerClient_);
+ this.setActiveTrace(traceName, data, false);
}.bind(this),
function(err) {
this.isRecording_ = false;
@@ -288,7 +290,9 @@
this.tracingControllerClient_);
resultPromise.then(
function(data) {
- this.setActiveTrace('trace.json.gz', data, true);
+ var traceName = tr.ui.e.about_tracing.defaultTraceName(
+ this.tracingControllerClient_);
+ this.setActiveTrace(traceName, data, true);
}.bind(this),
function(err) {
if (err instanceof tr.ui.e.about_tracing.UserCancelledError)
diff --git a/tracing/tracing/ui/extras/about_tracing/record_and_capture_controller.html b/tracing/tracing/ui/extras/about_tracing/record_and_capture_controller.html
index d733b15..1914bfa 100644
--- a/tracing/tracing/ui/extras/about_tracing/record_and_capture_controller.html
+++ b/tracing/tracing/ui/extras/about_tracing/record_and_capture_controller.html
@@ -211,6 +211,10 @@
return tracingControllerClient.endRecording();
}
+ function defaultTraceName(tracingControllerClient) {
+ return tracingControllerClient.defaultTraceName();
+ }
+
function UserCancelledError() {
Error.apply(this, arguments);
}
@@ -224,7 +228,8 @@
endMonitoring: endMonitoring,
captureMonitoring: captureMonitoring,
getMonitoringStatus: getMonitoringStatus,
- UserCancelledError: UserCancelledError
+ UserCancelledError: UserCancelledError,
+ defaultTraceName: defaultTraceName
};
});
</script>
diff --git a/tracing/tracing/ui/extras/about_tracing/tracing_controller_client.html b/tracing/tracing/ui/extras/about_tracing/tracing_controller_client.html
index 5e9dfdb..15f46ac 100644
--- a/tracing/tracing/ui/extras/about_tracing/tracing_controller_client.html
+++ b/tracing/tracing/ui/extras/about_tracing/tracing_controller_client.html
@@ -25,7 +25,8 @@
getCategories: function() { },
beginRecording: function(recordingOptions) { },
beginGetBufferPercentFull: function() { },
- endRecording: function() { }
+ endRecording: function() { },
+ defaultTraceName: function() { }
};
return {
diff --git a/tracing/tracing/ui/extras/about_tracing/xhr_based_tracing_controller_client.html b/tracing/tracing/ui/extras/about_tracing/xhr_based_tracing_controller_client.html
index 2ce163b..1e60c6e 100644
--- a/tracing/tracing/ui/extras/about_tracing/xhr_based_tracing_controller_client.html
+++ b/tracing/tracing/ui/extras/about_tracing/xhr_based_tracing_controller_client.html
@@ -97,6 +97,10 @@
return buffer;
}
);
+ },
+
+ defaultTraceName: function() {
+ return 'trace.json.gz';
}
};
