| Index: content/browser/tracing/tracing_ui.cc
|
| diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc
|
| index 234733b9f953fda3ccdfaa14cd1b83ac79b5454c..6619c3a1a8bfe1293f7c6b92ae1bffa22062e136 100644
|
| --- a/content/browser/tracing/tracing_ui.cc
|
| +++ b/content/browser/tracing/tracing_ui.cc
|
| @@ -249,8 +249,8 @@ TracingUI::~TracingUI() {
|
| void TracingUI::DoUploadBase64Encoded(const base::ListValue* args) {
|
| std::string file_contents_base64;
|
| if (!args || args->empty() || !args->GetString(0, &file_contents_base64)) {
|
| - web_ui()->CallJavascriptFunction("onUploadError",
|
| - base::StringValue("Missing data"));
|
| + web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
|
| + base::StringValue("Missing data"));
|
| return;
|
| }
|
|
|
| @@ -265,8 +265,8 @@ void TracingUI::DoUploadBase64Encoded(const base::ListValue* args) {
|
| void TracingUI::DoUpload(const base::ListValue* args) {
|
| std::string file_contents;
|
| if (!args || args->empty() || !args->GetString(0, &file_contents)) {
|
| - web_ui()->CallJavascriptFunction("onUploadError",
|
| - base::StringValue("Missing data"));
|
| + web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
|
| + base::StringValue("Missing data"));
|
| return;
|
| }
|
|
|
| @@ -276,14 +276,14 @@ void TracingUI::DoUpload(const base::ListValue* args) {
|
| void TracingUI::DoUploadInternal(const std::string& file_contents,
|
| TraceUploader::UploadMode upload_mode) {
|
| if (!delegate_) {
|
| - web_ui()->CallJavascriptFunction("onUploadError",
|
| - base::StringValue("Not implemented"));
|
| + web_ui()->CallJavascriptFunctionUnsafe(
|
| + "onUploadError", base::StringValue("Not implemented"));
|
| return;
|
| }
|
|
|
| if (trace_uploader_) {
|
| - web_ui()->CallJavascriptFunction("onUploadError",
|
| - base::StringValue("Upload in progress"));
|
| + web_ui()->CallJavascriptFunctionUnsafe(
|
| + "onUploadError", base::StringValue("Upload in progress"));
|
| return;
|
| }
|
|
|
| @@ -307,21 +307,20 @@ void TracingUI::DoUploadInternal(const std::string& file_contents,
|
| void TracingUI::OnTraceUploadProgress(int64_t current, int64_t total) {
|
| DCHECK(current <= total);
|
| int percent = (current / total) * 100;
|
| - web_ui()->CallJavascriptFunction(
|
| - "onUploadProgress",
|
| - base::FundamentalValue(percent),
|
| - base::StringValue(base::StringPrintf("%" PRId64, current)),
|
| - base::StringValue(base::StringPrintf("%" PRId64, total)));
|
| + web_ui()->CallJavascriptFunctionUnsafe(
|
| + "onUploadProgress", base::FundamentalValue(percent),
|
| + base::StringValue(base::StringPrintf("%" PRId64, current)),
|
| + base::StringValue(base::StringPrintf("%" PRId64, total)));
|
| }
|
|
|
| void TracingUI::OnTraceUploadComplete(bool success,
|
| const std::string& feedback) {
|
| if (success) {
|
| - web_ui()->CallJavascriptFunction("onUploadComplete",
|
| - base::StringValue(feedback));
|
| + web_ui()->CallJavascriptFunctionUnsafe("onUploadComplete",
|
| + base::StringValue(feedback));
|
| } else {
|
| - web_ui()->CallJavascriptFunction("onUploadError",
|
| - base::StringValue(feedback));
|
| + web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
|
| + base::StringValue(feedback));
|
| }
|
| trace_uploader_.reset();
|
| }
|
|
|