| Index: storage/browser/blob/blob_async_transport_request_builder.cc
|
| diff --git a/storage/browser/blob/blob_async_transport_request_builder.cc b/storage/browser/blob/blob_async_transport_request_builder.cc
|
| index a77d408ca8ffa34dd4ebea3e28b407520fe0cf5a..a55b2395b50184474cc501bdab94cbbe73cba353 100644
|
| --- a/storage/browser/blob/blob_async_transport_request_builder.cc
|
| +++ b/storage/browser/blob/blob_async_transport_request_builder.cc
|
| @@ -8,6 +8,7 @@
|
| #include <algorithm>
|
|
|
| #include "base/numerics/safe_math.h"
|
| +#include "base/strings/string_number_conversions.h"
|
| #include "storage/browser/blob/blob_async_transport_request_builder.h"
|
| #include "storage/common/blob_storage/blob_storage_constants.h"
|
|
|
| @@ -61,7 +62,8 @@ class FileStorageStrategy {
|
| request.message.handle_offset = segment_offset;
|
|
|
| requests->push_back(request);
|
| - builder->AppendFutureFile(segment_offset, size);
|
| + builder->AppendFutureFile(segment_offset, size,
|
| + base::SizeTToString(segment_index));
|
| current_item_index++;
|
| }
|
|
|
| @@ -261,26 +263,6 @@ void BlobAsyncTransportRequestBuilder::InitializeForIPCRequests(
|
| }
|
|
|
| /* static */
|
| -bool BlobAsyncTransportRequestBuilder::ShouldBeShortcut(
|
| - const std::vector<DataElement>& elements,
|
| - size_t memory_available) {
|
| - base::CheckedNumeric<size_t> shortcut_bytes = 0;
|
| - for (const auto& element : elements) {
|
| - DataElement::Type type = element.type();
|
| - if (type == DataElement::TYPE_BYTES_DESCRIPTION) {
|
| - return false;
|
| - }
|
| - if (type == DataElement::TYPE_BYTES) {
|
| - shortcut_bytes += element.length();
|
| - if (!shortcut_bytes.IsValid()) {
|
| - return false;
|
| - }
|
| - }
|
| - }
|
| - return shortcut_bytes.ValueOrDie() <= memory_available;
|
| -}
|
| -
|
| -/* static */
|
| void BlobAsyncTransportRequestBuilder::ComputeHandleSizes(
|
| uint64_t total_memory_size,
|
| size_t max_segment_size,
|
|
|