Index: content/browser/blob_storage/blob_slice_unittest.cc |
diff --git a/content/browser/blob_storage/blob_slice_unittest.cc b/content/browser/blob_storage/blob_slice_unittest.cc |
index 97d2bd05fa36eb51f539a7bc035976d25bc9c239..e7266fd3554a19d1da6cc41afe1fc2d01eef139f 100644 |
--- a/content/browser/blob_storage/blob_slice_unittest.cc |
+++ b/content/browser/blob_storage/blob_slice_unittest.cc |
@@ -48,16 +48,6 @@ |
ShareableBlobDataItem::POPULATED_WITHOUT_QUOTA)); |
}; |
- scoped_refptr<ShareableBlobDataItem> CreateTempFileItem(size_t offset, |
- size_t size) { |
- std::unique_ptr<DataElement> element(new DataElement()); |
- element->SetToFilePathRange(BlobDataBuilder::GetFutureFileItemPath(0), |
- offset, size, base::Time()); |
- return scoped_refptr<ShareableBlobDataItem>( |
- new ShareableBlobDataItem(new BlobDataItem(std::move(element)), |
- ShareableBlobDataItem::QUOTA_NEEDED)); |
- }; |
- |
void ExpectFirstSlice(const BlobSlice& slice, |
scoped_refptr<ShareableBlobDataItem> source_item, |
size_t first_item_slice_offset, |
@@ -66,10 +56,8 @@ |
EXPECT_EQ(first_item_slice_offset, slice.first_item_slice_offset); |
ASSERT_LE(1u, slice.dest_items.size()); |
- |
- scoped_refptr<ShareableBlobDataItem> item = slice.dest_items[0]; |
- EXPECT_EQ(ShareableBlobDataItem::QUOTA_NEEDED, item->state()); |
- const DataElement& dest_element = item->item()->data_element(); |
+ const DataElement& dest_element = |
+ slice.dest_items[0]->item()->data_element(); |
EXPECT_EQ(DataElement::TYPE_BYTES_DESCRIPTION, dest_element.type()); |
EXPECT_EQ(static_cast<uint64_t>(size), dest_element.length()); |
@@ -83,9 +71,8 @@ |
EXPECT_TRUE(slice.last_source_item); |
ASSERT_LE(2u, slice.dest_items.size()); |
- scoped_refptr<ShareableBlobDataItem> item = slice.dest_items.back(); |
- EXPECT_EQ(ShareableBlobDataItem::QUOTA_NEEDED, item->state()); |
- const DataElement& dest_element = item->item()->data_element(); |
+ const DataElement& dest_element = |
+ slice.dest_items.back()->item()->data_element(); |
EXPECT_EQ(DataElement::TYPE_BYTES_DESCRIPTION, dest_element.type()); |
EXPECT_EQ(static_cast<uint64_t>(size), dest_element.length()); |
@@ -95,6 +82,7 @@ |
}; |
TEST_F(BlobSliceTest, FullItem) { |
+ const std::string kBlobUUID = "kId"; |
const size_t kSize = 5u; |
BlobEntry data(kType, kDisposition); |
@@ -112,6 +100,7 @@ |
} |
TEST_F(BlobSliceTest, SliceSingleItem) { |
+ const std::string kBlobUUID = "kId"; |
const size_t kSize = 5u; |
BlobEntry data(kType, kDisposition); |
@@ -126,6 +115,7 @@ |
} |
TEST_F(BlobSliceTest, SliceSingleLastItem) { |
+ const std::string kBlobUUID = "kId"; |
const size_t kSize1 = 5u; |
const size_t kSize2 = 10u; |
@@ -142,6 +132,7 @@ |
} |
TEST_F(BlobSliceTest, SliceAcrossTwoItems) { |
+ const std::string kBlobUUID = "kId"; |
const size_t kSize1 = 5u; |
const size_t kSize2 = 10u; |
@@ -159,6 +150,7 @@ |
} |
TEST_F(BlobSliceTest, SliceFileAndLastItem) { |
+ const std::string kBlobUUID = "kId"; |
const size_t kSize1 = 5u; |
const size_t kSize2 = 10u; |
@@ -178,6 +170,7 @@ |
} |
TEST_F(BlobSliceTest, SliceAcrossLargeItem) { |
+ const std::string kBlobUUID = "kId"; |
const size_t kSize1 = 5u; |
const size_t kSize2 = 10u; |
const size_t kSize3 = 10u; |
@@ -199,23 +192,4 @@ |
EXPECT_EQ(*item2, *slice.dest_items[1]); |
} |
-TEST_F(BlobSliceTest, SliceTempFileItem) { |
- BlobEntry data(kType, kDisposition); |
- scoped_refptr<ShareableBlobDataItem> item1 = CreateTempFileItem(1u, 10u); |
- data.AppendSharedBlobItem(item1); |
- BlobSlice slice(data, 2, 5); |
- EXPECT_EQ(0u, slice.copying_memory_size.ValueOrDie()); |
- EXPECT_TRUE(slice.first_source_item); |
- EXPECT_EQ(2u, slice.first_item_slice_offset); |
- ASSERT_LE(1u, slice.dest_items.size()); |
- scoped_refptr<ShareableBlobDataItem> item = slice.dest_items[0]; |
- EXPECT_EQ(ShareableBlobDataItem::POPULATED_WITHOUT_QUOTA, item->state()); |
- |
- const DataElement& dest_element = item->item()->data_element(); |
- EXPECT_EQ(DataElement::TYPE_FILE, dest_element.type()); |
- EXPECT_EQ(static_cast<uint64_t>(5), dest_element.length()); |
- EXPECT_EQ(*item1, *slice.first_source_item); |
- ASSERT_EQ(1u, slice.dest_items.size()); |
-} |
- |
} // namespace storage |