Index: content/browser/fileapi/fileapi_message_filter.cc |
diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc |
index 17e3abe4592346db8818efc2915a8047e23c65da..62ec96ff77ab7a4ab40e80ffe7c7e137e3ec5499 100644 |
--- a/content/browser/fileapi/fileapi_message_filter.cc |
+++ b/content/browser/fileapi/fileapi_message_filter.cc |
@@ -44,7 +44,7 @@ using storage::FileSystemFileUtil; |
using storage::FileSystemBackend; |
using storage::FileSystemOperation; |
using storage::FileSystemURL; |
-using storage::BlobData; |
+using storage::BlobDataBuilder; |
using storage::BlobStorageContext; |
namespace content { |
@@ -519,9 +519,10 @@ void FileAPIMessageFilter::OnStartBuildingBlob(const std::string& uuid) { |
} |
void FileAPIMessageFilter::OnAppendBlobDataItemToBlob( |
- const std::string& uuid, const BlobData::Item& item) { |
+ const std::string& uuid, |
+ const storage::DataElement& item) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
- if (item.type() == BlobData::Item::TYPE_FILE_FILESYSTEM) { |
+ if (item.type() == storage::DataElement::TYPE_FILE_FILESYSTEM) { |
FileSystemURL filesystem_url(context_->CrackURL(item.filesystem_url())); |
if (!FileSystemURLIsValid(context_, filesystem_url) || |
!security_policy_->CanReadFileSystemFile(process_id_, filesystem_url)) { |
@@ -529,7 +530,7 @@ void FileAPIMessageFilter::OnAppendBlobDataItemToBlob( |
return; |
} |
} |
- if (item.type() == BlobData::Item::TYPE_FILE && |
+ if (item.type() == storage::DataElement::TYPE_FILE && |
!security_policy_->CanReadFile(process_id_, item.path())) { |
ignore_result(blob_storage_host_->CancelBuildingBlob(uuid)); |
return; |
@@ -560,7 +561,7 @@ void FileAPIMessageFilter::OnAppendSharedMemoryToBlob( |
return; |
} |
- BlobData::Item item; |
+ storage::DataElement item; |
item.SetToSharedBytes(static_cast<char*>(shared_memory.memory()), |
buffer_size); |
ignore_result(blob_storage_host_->AppendBlobDataItem(uuid, item)); |
@@ -613,7 +614,8 @@ void FileAPIMessageFilter::OnStartBuildingStream( |
} |
void FileAPIMessageFilter::OnAppendBlobDataItemToStream( |
- const GURL& url, const BlobData::Item& item) { |
+ const GURL& url, |
+ const storage::DataElement& item) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
scoped_refptr<Stream> stream(GetStreamForURL(url)); |
@@ -623,7 +625,7 @@ void FileAPIMessageFilter::OnAppendBlobDataItemToStream( |
return; |
// Data for stream is delivered as TYPE_BYTES item. |
- if (item.type() != BlobData::Item::TYPE_BYTES) { |
+ if (item.type() != storage::DataElement::TYPE_BYTES) { |
BadMessageReceived(); |
return; |
} |