Initial implementation of the ByteStream refactor.

content/browser/renderer_host/x509_user_cert_resource_handler.cc

Index: content/browser/renderer_host/x509_user_cert_resource_handler.cc
diff --git a/content/browser/renderer_host/x509_user_cert_resource_handler.cc b/content/browser/renderer_host/x509_user_cert_resource_handler.cc
index 95bf90342ddfe31fb49c7cc5fdd97e5a72390b22..99ada35dda0d369593fa91d695fbd51dcad07baf 100644
--- a/content/browser/renderer_host/x509_user_cert_resource_handler.cc
+++ b/content/browser/renderer_host/x509_user_cert_resource_handler.cc
@@ -116,7 +116,24 @@ X509UserCertResourceHandler::~X509UserCertResourceHandler() {
 }
 
 void X509UserCertResourceHandler::AssembleResource() {
-  size_t assembled_bytes = 0;
-  resource_buffer_ = content::AssembleData(buffer_, &assembled_bytes);
-  DCHECK_EQ(content_length_, assembled_bytes);
+  // 0-length IOBuffers are not allowed.
+  if (content_length_ == 0) {
+    resource_buffer_ = NULL;
+    return;
+  }
+
+  // Create the new buffer.
+  resource_buffer_ = new net::IOBuffer(content_length_);
+
+  // Copy the data into it.
+  size_t bytes_copied = 0;
+  for (size_t i = 0; i < buffer_.size(); ++i) {
+    net::IOBuffer* data = buffer_[i].first;
+    size_t data_len = buffer_[i].second;
+    DCHECK(data != NULL);
+    DCHECK_LE(bytes_copied + data_len, content_length_);
+    memcpy(resource_buffer_->data() + bytes_copied, data->data(), data_len);
+    bytes_copied += data_len;
+  }
+  DCHECK_EQ(content_length_, bytes_copied);
 }