| Index: content/browser/blob_storage/blob_reader_unittest.cc
|
| diff --git a/content/browser/blob_storage/blob_reader_unittest.cc b/content/browser/blob_storage/blob_reader_unittest.cc
|
| index dd519a0946548c2582c569245de7dd040529764b..0d450bf539f9bf964a1e92660aeac174c01d2010 100644
|
| --- a/content/browser/blob_storage/blob_reader_unittest.cc
|
| +++ b/content/browser/blob_storage/blob_reader_unittest.cc
|
| @@ -1174,9 +1174,12 @@ TEST_F(BlobReaderTest, RangeError) {
|
|
|
| TEST_F(BlobReaderTest, HandleBeforeAsyncCancel) {
|
| const std::string kUuid("uuid1");
|
| + const std::string kData("Hello!!!");
|
| + const size_t kDataSize = 8ul;
|
|
|
| - context_.CreatePendingBlob(kUuid, "", "");
|
| - blob_handle_ = context_.GetBlobDataFromUUID(kUuid);
|
| + BlobDataBuilder b(kUuid);
|
| + b.AppendFutureData(kDataSize);
|
| + blob_handle_ = context_.BuildBlob(b, true);
|
| provider_ = new MockFileStreamReaderProvider();
|
| reader_.reset(new BlobReader(blob_handle_.get(), base::WrapUnique(provider_),
|
| message_loop_.task_runner().get()));
|
| @@ -1184,7 +1187,7 @@ TEST_F(BlobReaderTest, HandleBeforeAsyncCancel) {
|
| EXPECT_EQ(BlobReader::Status::IO_PENDING,
|
| reader_->CalculateSize(base::Bind(&SetValue<int>, &size_result)));
|
| EXPECT_FALSE(reader_->IsInMemory());
|
| - context_.CancelPendingBlob(kUuid, IPCBlobCreationCancelCode::UNKNOWN);
|
| + context_.BreakAndFinishBlob(kUuid, IPCBlobCreationCancelCode::UNKNOWN);
|
| base::RunLoop().RunUntilIdle();
|
| EXPECT_EQ(net::ERR_FAILED, size_result);
|
| }
|
| @@ -1195,9 +1198,8 @@ TEST_F(BlobReaderTest, ReadFromIncompleteBlob) {
|
| const size_t kDataSize = 8ul;
|
|
|
| BlobDataBuilder b(kUuid);
|
| - b.AppendData(kData);
|
| - context_.CreatePendingBlob(kUuid, "", "");
|
| - blob_handle_ = context_.GetBlobDataFromUUID(kUuid);
|
| + b.AppendFutureData(kDataSize);
|
| + blob_handle_ = context_.BuildBlob(b, true);
|
| provider_ = new MockFileStreamReaderProvider();
|
| reader_.reset(new BlobReader(blob_handle_.get(), base::WrapUnique(provider_),
|
| message_loop_.task_runner().get()));
|
| @@ -1205,7 +1207,8 @@ TEST_F(BlobReaderTest, ReadFromIncompleteBlob) {
|
| EXPECT_EQ(BlobReader::Status::IO_PENDING,
|
| reader_->CalculateSize(base::Bind(&SetValue<int>, &size_result)));
|
| EXPECT_FALSE(reader_->IsInMemory());
|
| - context_.CompletePendingBlob(b);
|
| + b.PopulateFutureData(0, kData.data(), 0, kDataSize);
|
| + context_.FinishedPopulatingBlob(kUuid);
|
| base::RunLoop().RunUntilIdle();
|
| CheckSizeCalculatedAsynchronously(kDataSize, size_result);
|
| scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kDataSize));
|
|
|