| Index: content/browser/media/android/media_resource_getter_impl.cc
|
| diff --git a/content/browser/media/android/media_resource_getter_impl.cc b/content/browser/media/android/media_resource_getter_impl.cc
|
| index 686e01c331c43ca5535f49931315006fafe1ccf8..b8c2c2a372bb3cae39383e682d7e7927e38096e2 100644
|
| --- a/content/browser/media/android/media_resource_getter_impl.cc
|
| +++ b/content/browser/media/android/media_resource_getter_impl.cc
|
| @@ -29,6 +29,7 @@
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "storage/browser/blob/blob_data_handle.h"
|
| #include "storage/browser/blob/blob_storage_context.h"
|
| +#include "storage/common/blob/blob_data.h"
|
| #include "url/gurl.h"
|
|
|
| using base::android::ConvertUTF8ToJavaString;
|
| @@ -51,7 +52,7 @@ static void RequestPlatformPathFromBlobURL(
|
| ChromeBlobStorageContext* blob_storage_context =
|
| GetChromeBlobStorageContextForResourceContext(resource_context);
|
|
|
| - scoped_ptr<storage::BlobDataHandle> handle =
|
| + scoped_ptr<storage::BlobDataSnapshotHandle> handle =
|
| blob_storage_context->context()->GetBlobDataFromPublicURL(url);
|
| if (!handle) {
|
| // There are plenty of cases where handle can be empty. The most trivial is
|
| @@ -59,18 +60,19 @@ static void RequestPlatformPathFromBlobURL(
|
| ReturnResultOnUIThread(callback, std::string());
|
| return;
|
| }
|
| - storage::BlobData* data = handle->data();
|
| + const storage::BlobDataSnapshot* data = handle->data();
|
| if (!data) {
|
| ReturnResultOnUIThread(callback, std::string());
|
| NOTREACHED();
|
| return;
|
| }
|
| - const std::vector<storage::BlobData::Item> items = data->items();
|
| + const std::vector<scoped_refptr<storage::BlobDataItem>>& items =
|
| + data->items();
|
|
|
| // TODO(qinmin): handle the case when the blob data is not a single file.
|
| DLOG_IF(WARNING, items.size() != 1u)
|
| << "More than one blob data are present: " << items.size();
|
| - ReturnResultOnUIThread(callback, items[0].path().value());
|
| + ReturnResultOnUIThread(callback, items[0]->path().value());
|
| }
|
|
|
| static void RequestPlaformPathFromFileSystemURL(
|
|
|