Index: content/browser/fileapi/blob_storage_context_unittest.cc |
diff --git a/content/browser/fileapi/blob_storage_context_unittest.cc b/content/browser/fileapi/blob_storage_context_unittest.cc |
index 6ac1832894c3a22d66d3b1f11b202a40a1ceac7e..1359b37fc625bca4958a31df746251f02dfc172d 100644 |
--- a/content/browser/fileapi/blob_storage_context_unittest.cc |
+++ b/content/browser/fileapi/blob_storage_context_unittest.cc |
@@ -13,14 +13,17 @@ |
#include "storage/browser/blob/blob_storage_context.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-using storage::BlobDataHandle; |
+using storage::BlobDataBuilder; |
+using storage::BlobDataSnapshotHandle; |
+using storage::BlobStorageContext; |
+using storage::DataElement; |
namespace content { |
namespace { |
void SetupBasicBlob(BlobStorageHost* host, const std::string& id) { |
EXPECT_TRUE(host->StartBuildingBlob(id)); |
- BlobData::Item item; |
+ DataElement item; |
item.SetToBytes("1", 1); |
EXPECT_TRUE(host->AppendBlobDataItem(id, item)); |
EXPECT_TRUE(host->FinishBuildingBlob(id, "text/plain")); |
@@ -38,7 +41,7 @@ TEST(BlobStorageContextTest, IncrementDecrementRef) { |
SetupBasicBlob(&host, kId); |
// Make sure it's there, finish building implies a ref of one. |
- scoped_ptr<BlobDataHandle> blob_data_handle; |
+ scoped_ptr<BlobDataSnapshotHandle> blob_data_handle; |
blob_data_handle = context.GetBlobDataFromUUID(kId); |
EXPECT_TRUE(blob_data_handle); |
blob_data_handle.reset(); |
@@ -66,7 +69,7 @@ TEST(BlobStorageContextTest, IncrementDecrementRef) { |
EXPECT_FALSE(host.IncrementBlobRefCount(kId)); |
} |
-TEST(BlobStorageContextTest, BlobDataHandle) { |
+TEST(BlobStorageContextTest, BlobDataSnapshotHandle) { |
BlobStorageContext context; |
BlobStorageHost host(&context); |
base::MessageLoop fake_io_message_loop; |
@@ -76,7 +79,7 @@ TEST(BlobStorageContextTest, BlobDataHandle) { |
SetupBasicBlob(&host, kId); |
// Get a handle to it. |
- scoped_ptr<BlobDataHandle> blob_data_handle = |
+ scoped_ptr<BlobDataSnapshotHandle> blob_data_handle = |
context.GetBlobDataFromUUID(kId); |
EXPECT_TRUE(blob_data_handle); |
@@ -84,7 +87,7 @@ TEST(BlobStorageContextTest, BlobDataHandle) { |
EXPECT_TRUE(host.DecrementBlobRefCount(kId)); |
// Should still be there due to the handle. |
- scoped_ptr<BlobDataHandle> another_handle = |
+ scoped_ptr<BlobDataSnapshotHandle> another_handle = |
context.GetBlobDataFromUUID(kId); |
EXPECT_TRUE(another_handle); |
@@ -111,19 +114,20 @@ TEST(BlobStorageContextTest, CompoundBlobs) { |
base::Time::FromString("Tue, 15 Nov 1994, 12:45:26 GMT", &time1); |
base::Time::FromString("Mon, 14 Nov 1994, 11:30:49 GMT", &time2); |
- scoped_refptr<BlobData> blob_data1(new BlobData(kId1)); |
+ scoped_ptr<BlobDataBuilder> blob_data1(new BlobDataBuilder(kId1)); |
blob_data1->AppendData("Data1"); |
blob_data1->AppendData("Data2"); |
blob_data1->AppendFile(base::FilePath(FILE_PATH_LITERAL("File1.txt")), |
10, 1024, time1); |
- scoped_refptr<BlobData> blob_data2(new BlobData(kId2)); |
+ scoped_ptr<BlobDataBuilder> blob_data2(new BlobDataBuilder(kId2)); |
blob_data2->AppendData("Data3"); |
blob_data2->AppendBlob(kId1, 8, 100); |
blob_data2->AppendFile(base::FilePath(FILE_PATH_LITERAL("File2.txt")), |
0, 20, time2); |
- scoped_refptr<BlobData> canonicalized_blob_data2(new BlobData(kId2Prime)); |
+ scoped_ptr<BlobDataBuilder> canonicalized_blob_data2( |
+ new BlobDataBuilder(kId2Prime)); |
canonicalized_blob_data2->AppendData("Data3"); |
canonicalized_blob_data2->AppendData("a2___", 2); |
canonicalized_blob_data2->AppendFile( |
@@ -133,17 +137,19 @@ TEST(BlobStorageContextTest, CompoundBlobs) { |
base::FilePath(FILE_PATH_LITERAL("File2.txt")), 0, 20, time2); |
BlobStorageContext context; |
- scoped_ptr<BlobDataHandle> blob_data_handle; |
+ scoped_ptr<BlobDataSnapshotHandle> blob_data_handle; |
// Test a blob referring to only data and a file. |
- blob_data_handle = context.AddFinishedBlob(blob_data1.get()); |
- ASSERT_TRUE(blob_data_handle.get()); |
- EXPECT_TRUE(*(blob_data_handle->data()) == *blob_data1.get()); |
+ blob_data_handle = context.AddFinishedBlob(*blob_data1.get()); |
+ ASSERT_TRUE(blob_data_handle); |
+ ASSERT_TRUE(blob_data_handle->data()); |
+ EXPECT_EQ(*(blob_data_handle->data()), *blob_data1); |
// Test a blob composed in part with another blob. |
- blob_data_handle = context.AddFinishedBlob(blob_data2.get()); |
- ASSERT_TRUE(blob_data_handle.get()); |
- EXPECT_TRUE(*(blob_data_handle->data()) == *canonicalized_blob_data2.get()); |
+ blob_data_handle = context.AddFinishedBlob(*blob_data2.get()); |
+ ASSERT_TRUE(blob_data_handle); |
+ ASSERT_TRUE(blob_data_handle->data()); |
+ EXPECT_EQ(*(blob_data_handle->data()), *canonicalized_blob_data2); |
blob_data_handle.reset(); |
{ // Clean up for ASAN |
@@ -164,7 +170,7 @@ TEST(BlobStorageContextTest, PublicBlobUrls) { |
// Now register a url for that blob. |
GURL kUrl("blob:id"); |
EXPECT_TRUE(host.RegisterPublicBlobURL(kUrl, kId)); |
- scoped_ptr<BlobDataHandle> blob_data_handle = |
+ scoped_ptr<BlobDataSnapshotHandle> blob_data_handle = |
context.GetBlobDataFromPublicURL(kUrl); |
ASSERT_TRUE(blob_data_handle.get()); |
EXPECT_EQ(kId, blob_data_handle->data()->uuid()); |
@@ -205,7 +211,8 @@ TEST(BlobStorageContextTest, HostCleanup) { |
// All should disappear upon host deletion. |
host.reset(); |
- scoped_ptr<BlobDataHandle> handle = context.GetBlobDataFromPublicURL(kUrl); |
+ scoped_ptr<BlobDataSnapshotHandle> handle = |
+ context.GetBlobDataFromPublicURL(kUrl); |
EXPECT_TRUE(!handle.get()); |
handle = context.GetBlobDataFromUUID(kId); |
EXPECT_TRUE(!handle.get()); |
@@ -222,7 +229,7 @@ TEST(BlobStorageContextTest, EarlyContextDeletion) { |
const std::string kId("id"); |
GURL kUrl("blob:id"); |
EXPECT_FALSE(host.StartBuildingBlob(kId)); |
- BlobData::Item item; |
+ DataElement item; |
item.SetToBytes("1", 1); |
EXPECT_FALSE(host.AppendBlobDataItem(kId, item)); |
EXPECT_FALSE(host.FinishBuildingBlob(kId, "text/plain")); |