| Index: content/child/blob_storage/blob_transport_controller.cc
|
| diff --git a/content/child/blob_storage/blob_transport_controller.cc b/content/child/blob_storage/blob_transport_controller.cc
|
| index 602860b54048cfac902811b5f6010ce141bd8406..81fc2bdb88a9e9bcd0daf454634a09bd8e4a6d5e 100644
|
| --- a/content/child/blob_storage/blob_transport_controller.cc
|
| +++ b/content/child/blob_storage/blob_transport_controller.cc
|
| @@ -12,6 +12,7 @@
|
| #include "base/stl_util.h"
|
| #include "content/child/blob_storage/blob_consolidation.h"
|
| #include "content/child/thread_safe_sender.h"
|
| +#include "content/common/fileapi/webblob_messages.h"
|
| #include "ipc/ipc_sender.h"
|
| #include "storage/common/blob_storage/blob_item_bytes_request.h"
|
| #include "storage/common/blob_storage/blob_item_bytes_response.h"
|
| @@ -48,13 +49,12 @@ void BlobTransportController::InitiateBlobTransfer(
|
| const std::string& type,
|
| scoped_ptr<BlobConsolidation> consolidation,
|
| IPC::Sender* sender) {
|
| + DCHECK(sender);
|
| BlobConsolidation* consolidation_ptr = consolidation.get();
|
| - blob_storage_.insert(std::make_pair(uuid, consolidation.Pass()));
|
| + blob_storage_[uuid] = std::move(consolidation);
|
| std::vector<storage::DataElement> descriptions;
|
| GetDescriptions(consolidation_ptr, kLargeThresholdBytes, &descriptions);
|
| - // TODO(dmurph): Uncomment when IPC messages are added.
|
| - // sender->Send(new BlobStorageMsg_StartBuildingBlob(uuid, type,
|
| - // descriptions));
|
| + sender->Send(new BlobStorageMsg_StartBuildingBlob(uuid, type, descriptions));
|
| }
|
|
|
| void BlobTransportController::OnMemoryRequest(
|
| @@ -63,6 +63,7 @@ void BlobTransportController::OnMemoryRequest(
|
| std::vector<base::SharedMemoryHandle>* memory_handles,
|
| const std::vector<IPC::PlatformFileForTransit>& file_handles,
|
| IPC::Sender* sender) {
|
| + DCHECK(sender);
|
| std::vector<storage::BlobItemBytesResponse> responses;
|
| ResponsesStatus status =
|
| GetResponses(uuid, requests, memory_handles, file_handles, &responses);
|
| @@ -84,8 +85,7 @@ void BlobTransportController::OnMemoryRequest(
|
| break;
|
| }
|
|
|
| - // TODO(dmurph): Uncomment when IPC messages are added.
|
| - // sender->Send(new BlobStorageMsg_MemoryItemResponse(uuid, responses));
|
| + sender->Send(new BlobStorageMsg_MemoryItemResponse(uuid, responses));
|
| }
|
|
|
| void BlobTransportController::OnCancel(
|
| @@ -119,8 +119,8 @@ BlobTransportController::BlobTransportController() {}
|
| void BlobTransportController::CancelBlobTransfer(const std::string& uuid,
|
| IPCBlobCreationCancelCode code,
|
| IPC::Sender* sender) {
|
| - // TODO(dmurph): Uncomment when IPC messages are added.
|
| - // sender->Send(new BlobStorageMsg_CancelBuildingBlob(uuid, code));
|
| + DCHECK(sender);
|
| + sender->Send(new BlobStorageMsg_CancelBuildingBlob(uuid, code));
|
| ReleaseBlobConsolidation(uuid);
|
| }
|
|
|
|
|