| Index: content/browser/loader/upload_data_stream_builder.cc
|
| diff --git a/content/browser/loader/upload_data_stream_builder.cc b/content/browser/loader/upload_data_stream_builder.cc
|
| index 2db9fdf0fefe939f723f7cf4c83e8b36e6fc0eaf..d13cf170c08491ecce77bde1dc2adb77d3614633 100644
|
| --- a/content/browser/loader/upload_data_stream_builder.cc
|
| +++ b/content/browser/loader/upload_data_stream_builder.cc
|
| @@ -64,7 +64,6 @@ class FileElementReader : public net::UploadFileElementReader {
|
| };
|
|
|
| void ResolveBlobReference(
|
| - ResourceRequestBody* body,
|
| webkit_blob::BlobStorageContext* blob_context,
|
| const ResourceRequestBody::Element& element,
|
| std::vector<const ResourceRequestBody::Element*>* resolved_elements) {
|
| @@ -85,11 +84,6 @@ void ResolveBlobReference(
|
| DCHECK_NE(BlobData::Item::TYPE_BLOB, item.type());
|
| resolved_elements->push_back(&item);
|
| }
|
| -
|
| - // Ensure the blob and any attached shareable files survive until
|
| - // upload completion. The |body| takes ownership of |handle|.
|
| - const void* key = handle.get();
|
| - body->SetUserData(key, handle.release());
|
| }
|
|
|
| } // namespace
|
| @@ -104,7 +98,7 @@ scoped_ptr<net::UploadDataStream> UploadDataStreamBuilder::Build(
|
| for (size_t i = 0; i < body->elements()->size(); ++i) {
|
| const ResourceRequestBody::Element& element = (*body->elements())[i];
|
| if (element.type() == ResourceRequestBody::Element::TYPE_BLOB)
|
| - ResolveBlobReference(body, blob_context, element, &resolved_elements);
|
| + ResolveBlobReference(blob_context, element, &resolved_elements);
|
| else
|
| resolved_elements.push_back(&element);
|
| }
|
|
|