Revert of Update Crashpad to 6da9708e7cc93e2e1772439d51646e47583cb225

third_party/crashpad/crashpad/util/net/http_multipart_builder.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "util/net/http_multipart_builder.h"
 
 #include <sys/types.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "util/net/http_body.h"
-#include "util/net/http_body_gzip.h"
 
 namespace crashpad {
 
 namespace {
 
 const char kCRLF[] = "\r\n";
 
 const char kBoundaryCRLF[] = "\r\n\r\n";
 
 // Generates a random string suitable for use as a multipart boundary.
@@ skipping 73 matching lines @@
           c == '.' ||
           c == '_' ||
           c == '+' ||
           c == '-');
   }
 }
 
 }  // namespace
 
 HTTPMultipartBuilder::HTTPMultipartBuilder()
-    : boundary_(GenerateBoundaryString()),
-      form_data_(),
-      file_attachments_(),
-      gzip_enabled_(false) {}
+    : boundary_(GenerateBoundaryString()), form_data_(), file_attachments_() {
+}
 
 HTTPMultipartBuilder::~HTTPMultipartBuilder() {
 }
 
-void HTTPMultipartBuilder::SetGzipEnabled(bool gzip_enabled) {
-  gzip_enabled_ = gzip_enabled;
-}
-
 void HTTPMultipartBuilder::SetFormData(const std::string& key,
                                        const std::string& value) {
   EraseKey(key);
   form_data_[key] = value;
 }
 
 void HTTPMultipartBuilder::SetFileAttachment(
     const std::string& key,
     const std::string& upload_file_name,
     const base::FilePath& path,
@@ skipping 37 matching lines @@
         attachment.content_type.c_str(), kBoundaryCRLF);
 
     streams.push_back(new StringHTTPBodyStream(header));
     streams.push_back(new FileHTTPBodyStream(attachment.path));
     streams.push_back(new StringHTTPBodyStream(kCRLF));
   }
 
   streams.push_back(
       new StringHTTPBodyStream("--"  + boundary_ + "--" + kCRLF));
 
-  auto composite =
-      std::unique_ptr<HTTPBodyStream>(new CompositeHTTPBodyStream(streams));
-  if (gzip_enabled_) {
-    return std::unique_ptr<HTTPBodyStream>(
-        new GzipHTTPBodyStream(std::move(composite)));
-  }
-  return composite;
+  return std::unique_ptr<HTTPBodyStream>(new CompositeHTTPBodyStream(streams));
 }
 
-void HTTPMultipartBuilder::PopulateContentHeaders(
-    HTTPHeaders* http_headers) const {
+HTTPHeaders::value_type HTTPMultipartBuilder::GetContentType() const {
   std::string content_type =
       base::StringPrintf("multipart/form-data; boundary=%s", boundary_.c_str());
-  (*http_headers)[kContentType] = content_type;
-
-  if (gzip_enabled_) {
-    (*http_headers)[kContentEncoding] = "gzip";
-  }
+  return std::make_pair(kContentType, content_type);
 }
 
 void HTTPMultipartBuilder::EraseKey(const std::string& key) {
   auto data_it = form_data_.find(key);
   if (data_it != form_data_.end())
     form_data_.erase(data_it);
 
   auto file_it = file_attachments_.find(key);
   if (file_it != file_attachments_.end())
     file_attachments_.erase(file_it);
 }
 
 }  // namespace crashpad