Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7512)

Unified Diff: chrome/browser/tracing/crash_service_uploader.cc

Issue 1002103004: NOT FOR REVIEW - Slow Reports Reference Implementation Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: JSON serialization. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tracing/crash_service_uploader.cc
diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
index ed408d516ea063eea85c3001874817569da37d22..fb9c4f99f7255c25466f3b6d777263dba8422cd3 100644
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -93,6 +93,10 @@ void TraceCrashServiceUploader::DoUpload(
done_callback));
}
+void TraceCrashServiceUploader::SetUploadURL(const std::string& url) {
+ upload_url_ = url;
+}
+
void TraceCrashServiceUploader::DoUploadOnFileThread(
const std::string& file_contents,
const UploadProgressCallback& progress_callback,
@@ -106,6 +110,9 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
std::string upload_url = kUploadURL;
+ if (!upload_url_.empty())
+ upload_url = upload_url_;
+
if (command_line.HasSwitch(switches::kTraceUploadURL)) {
upload_url = command_line.GetSwitchValueASCII(switches::kTraceUploadURL);
}
@@ -150,18 +157,20 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
return;
}
- scoped_ptr<char[]> compressed_contents(new char[kMaxUploadBytes]);
- int compressed_bytes;
- if (!Compress(file_contents, kMaxUploadBytes, compressed_contents.get(),
- &compressed_bytes)) {
- OnUploadError("Compressing file failed.");
- return;
- }
-
std::string post_data;
- SetupMultipart(product, version, "trace.json.gz",
- std::string(compressed_contents.get(), compressed_bytes),
- &post_data);
+ SetupMultipart(product, version, "trace.json.gz", file_contents, &post_data);
+ // scoped_ptr<char[]> compressed_contents(new char[kMaxUploadBytes]);
+ // int compressed_bytes;
+ // if (!Compress(file_contents, kMaxUploadBytes, compressed_contents.get(),
+ // &compressed_bytes)) {
+ // OnUploadError("Compressing file failed.");
+ // return;
+ // }
+ //
+ // std::string post_data;
+ // SetupMultipart(product, version, "trace.json.gz",
+ // std::string(compressed_contents.get(), compressed_bytes),
+ // &post_data);
content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE,
« no previous file with comments | « chrome/browser/tracing/crash_service_uploader.h ('k') | content/browser/tracing/background_tracing_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698