Add extra headers argument so we don't pass headers in the body.

content/browser/download/mhtml_generation_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/download/mhtml_generation_manager.h"
 
 #include <map>
 #include <queue>
 #include <utility>
 
@@ skipping 469 matching lines @@
 
   const std::vector<MHTMLExtraDataPart>& extra_data_parts(extra_parts->parts());
   if (extra_data_parts.empty())
     return true;
 
   std::string serialized_extra_data_parts;
 
   // For each extra part, serialize that part and add to our accumulator
   // string.
   for (auto part : extra_data_parts) {
-    // Write a newline, then a boundary, another newline, then the content
-    // location, another newline, the content type, another newline, the another
-    // newline, the extra data string, and end with a newline.
+    // Write a newline, then a boundary, a newline, then the content
+    // location, a newline, the content type, a newline, extra_headers,
+    // two newlines, the body, and end with a newline.
     std::string serialized_extra_data_part = base::StringPrintf(
-        "--%s\r\n%s%s\r\n%s%s\r\n%s\r\n", boundary.c_str(), kContentLocation,
-        part.content_location.c_str(), kContentType, part.content_type.c_str(),
+        "--%s\r\n%s%s\r\n%s%s\r\n%s\r\n\r\n%s\r\n", boundary.c_str(),
+        kContentLocation, part.content_location.c_str(), kContentType,
+        part.content_type.c_str(), part.extra_headers.c_str(),
         part.body.c_str());
     DCHECK(base::IsStringASCII(serialized_extra_data_part));
 
     serialized_extra_data_parts += serialized_extra_data_part;
   }
 
   // Write the string into the file.  Returns false if we failed the write.
   return (file.WriteAtCurrentPos(serialized_extra_data_parts.data(),
                                  serialized_extra_data_parts.size()) >= 0);
 }
@@ skipping 183 matching lines @@
   return iter->second.get();
 }
 
 void MHTMLGenerationManager::RenderProcessExited(Job* job) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(job);
   JobFinished(job, MhtmlSaveStatus::RENDER_PROCESS_EXITED);
 }
 
 }  // namespace content