| Index: webkit/browser/blob/blob_storage_context.cc
|
| diff --git a/webkit/browser/blob/blob_storage_context.cc b/webkit/browser/blob/blob_storage_context.cc
|
| index 84c5193240d28a15bf7aabeb9203e069cdbbde6d..f62a26dbe545aed3ab1bd27c1d6a83096670cd7e 100644
|
| --- a/webkit/browser/blob/blob_storage_context.cc
|
| +++ b/webkit/browser/blob/blob_storage_context.cc
|
| @@ -114,14 +114,6 @@ void BlobStorageContext::RevokePublicBlobURL(const GURL& blob_url) {
|
| public_blob_urls_.erase(blob_url);
|
| }
|
|
|
| -std::string BlobStorageContext::LookupUuidFromDeprecatedURL(
|
| - const GURL& url) {
|
| - BlobURLMap::const_iterator found = deprecated_blob_urls_.find(url);
|
| - if (found == deprecated_blob_urls_.end())
|
| - return std::string();
|
| - return found->second;
|
| -}
|
| -
|
| void BlobStorageContext::StartBuildingBlob(const std::string& uuid) {
|
| DCHECK(!IsInUse(uuid) && !uuid.empty());
|
| blob_map_[uuid] = BlobMapEntry(1, BEING_BUILT, new BlobData(uuid));
|
| @@ -174,10 +166,7 @@ void BlobStorageContext::AppendBlobDataItem(
|
| item.expected_modification_time());
|
| break;
|
| case BlobData::Item::TYPE_BLOB: {
|
| - scoped_ptr<BlobDataHandle> src = GetBlobDataFromUUID(
|
| - item.blob_uuid().empty()
|
| - ? LookupUuidFromDeprecatedURL(item.blob_url())
|
| - : item.blob_uuid());
|
| + scoped_ptr<BlobDataHandle> src = GetBlobDataFromUUID(item.blob_uuid());
|
| if (src)
|
| exceeded_memory = !ExpandStorageItems(target_blob_data,
|
| src->data(),
|
| @@ -236,21 +225,6 @@ void BlobStorageContext::DecrementBlobRefCount(const std::string& uuid) {
|
| }
|
| }
|
|
|
| -void BlobStorageContext::DeprecatedRegisterPrivateBlobURL(
|
| - const GURL& url, const std::string& uuid) {
|
| - if (!IsInUse(uuid))
|
| - return;
|
| - IncrementBlobRefCount(uuid);
|
| - deprecated_blob_urls_[url] = uuid;
|
| -}
|
| -
|
| -void BlobStorageContext::DeprecatedRevokePrivateBlobURL(const GURL& url) {
|
| - if (deprecated_blob_urls_.find(url) == deprecated_blob_urls_.end())
|
| - return;
|
| - DecrementBlobRefCount(deprecated_blob_urls_[url]);
|
| - deprecated_blob_urls_.erase(url);
|
| -}
|
| -
|
| bool BlobStorageContext::ExpandStorageItems(
|
| BlobData* target_blob_data, BlobData* src_blob_data,
|
| uint64 offset, uint64 length) {
|
|
|