Relanding this....

chrome/common/common_param_traits.cc

 // Copyright (c) 2011 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 "chrome/common/common_param_traits.h"
 
 #include "base/time.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/geoposition.h"
@@ skipping 360 matching lines @@
 struct ParamTraits<net::UploadData::Element> {
   typedef net::UploadData::Element param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, static_cast<int>(p.type()));
     switch (p.type()) {
       case net::UploadData::TYPE_BYTES: {
         m->WriteData(&p.bytes()[0], static_cast<int>(p.bytes().size()));
         break;
       }
       case net::UploadData::TYPE_CHUNK: {
-        m->WriteData(&p.bytes()[0], static_cast<int>(p.bytes().size()));
+        std::string chunk_length = StringPrintf(
+            "%X\r\n", static_cast<unsigned int>(p.bytes().size()));
+        std::vector<char> bytes;
+        bytes.insert(bytes.end(), chunk_length.data(),
+                     chunk_length.data() + chunk_length.length());
+        const char* data = &p.bytes()[0];
+        bytes.insert(bytes.end(), data, data + p.bytes().size());
+        const char* crlf = "\r\n";
+        bytes.insert(bytes.end(), crlf, crlf + strlen(crlf));
+        if (p.is_last_chunk()) {
+          const char* end_of_data = "0\r\n\r\n";
+          bytes.insert(bytes.end(), end_of_data,
+                       end_of_data + strlen(end_of_data));
+        }
+        m->WriteData(&bytes[0], static_cast<int>(bytes.size()));
         // If this element is part of a chunk upload then send over information
         // indicating if this is the last chunk.
         WriteParam(m, p.is_last_chunk());
         break;
       }
       case net::UploadData::TYPE_FILE: {
         WriteParam(m, p.file_path());
         WriteParam(m, p.file_range_offset());
         WriteParam(m, p.file_range_length());
         WriteParam(m, p.expected_file_modification_time());
@@ skipping 344 matching lines @@
   l->append(",");
   LogParam(p.caps_mime_type, l);
   l->append(",");
   LogParam(p.printer_defaults, l);
   l->append(",");
   LogParam(p.defaults_mime_type, l);
   l->append(")");
 }
 
 }  // namespace IPC