Revert of Update Crashpad to 6da9708e7cc93e2e1772439d51646e47583cb225

third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc

Index: third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
diff --git a/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc b/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
index 2c2b69b937cdc45545fec3861b91eedd66acb16c..5bd1fbf9318d7084f97bc2b57b3e3e184dcb2313 100644
--- a/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
+++ b/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
@@ -139,8 +139,7 @@ class CallRecordUploadAttempt {
 
 CrashReportUploadThread::CrashReportUploadThread(CrashReportDatabase* database,
                                                  const std::string& url,
-                                                 bool rate_limit,
-                                                 bool upload_gzip)
+                                                 bool rate_limit)
     : url_(url),
       // Check for pending reports every 15 minutes, even in the absence of a
       // signal from the handler thread. This allows for failed uploads to be
@@ -148,8 +147,7 @@ CrashReportUploadThread::CrashReportUploadThread(CrashReportDatabase* database,
       // processes to be recognized.
       thread_(15 * 60, this),
       database_(database),
-      rate_limit_(rate_limit),
-      upload_gzip_(upload_gzip) {
+      rate_limit_(rate_limit) {
 }
 
 CrashReportUploadThread::~CrashReportUploadThread() {
@@ -310,7 +308,6 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
   }
 
   HTTPMultipartBuilder http_multipart_builder;
-  http_multipart_builder.SetGzipEnabled(upload_gzip_);
 
   const char kMinidumpKey[] = "upload_file_minidump";
 
@@ -335,11 +332,9 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
 
   std::unique_ptr<HTTPTransport> http_transport(HTTPTransport::Create());
   http_transport->SetURL(url_);
-  HTTPHeaders content_headers;
-  http_multipart_builder.PopulateContentHeaders(&content_headers);
-  for (const auto& content_header : content_headers) {
-    http_transport->SetHeader(content_header.first, content_header.second);
-  }
+  HTTPHeaders::value_type content_type =
+      http_multipart_builder.GetContentType();
+  http_transport->SetHeader(content_type.first, content_type.second);
   http_transport->SetBodyStream(http_multipart_builder.GetBodyStream());
   // TODO(mark): The timeout should be configurable by the client.
   http_transport->SetTimeout(60.0);  // 1 minute.