New blobstoragecontext for use in the main browser process, not plugged in yet.

webkit/blob/blob_storage_context_unittest.cc

Index: webkit/blob/blob_storage_context_unittest.cc
===================================================================
--- webkit/blob/blob_storage_context_unittest.cc	(revision 190469)
+++ webkit/blob/blob_storage_context_unittest.cc	(working copy)
@@ -5,32 +5,107 @@
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/message_loop.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/blob/blob_data.h"
-#include "webkit/blob/blob_storage_controller.h"
+#include "webkit/blob/blob_storage_context.h"
 
 namespace webkit_blob {
 
-TEST(BlobStorageControllerTest, RegisterBlobUrl) {
+namespace {
+void SetupBasicBlob(BlobStorageHost* host, const std::string& id) {
+  host->StartBuildingBlob(id);
+  BlobData::Item item;
+  item.SetToBytes("1", 1);
+  host->AppendBlobDataItem(id, item);
+  host->FinishBuildingBlob(id, "text/plain");
+}
+}  // anon namespace

[kinuko, 2013/04/23 05:30:39]

nit: '//  namespace' seems to be more common thesedays in chrome

[michaeln, 2013/04/23 19:27:16]

Done.

+
+TEST(BlobStorageContextTest, IncrementDecrementRef) {
+  BlobStorageContext context;
+  BlobStorageHost host(&context);
+  MessageLoop fake_io_message_loop;
+
+  // Build up a basic blob.
+  const std::string kId("id");
+  SetupBasicBlob(&host, kId);
+
+  // Make sure it's there, finish building implies a ref of one.
+  scoped_ptr<BlobDataHandle> blob_data_handle;
+  blob_data_handle = context.GetBlobDataFromUUID(kId);
+  EXPECT_TRUE(blob_data_handle);
+  blob_data_handle.reset();
+
+  // Make sure its still there after inc/dec.
+  host.IncrementBlobRefCount(kId);
+  host.DecrementBlobRefCount(kId);
+  blob_data_handle = context.GetBlobDataFromUUID(kId);
+  EXPECT_TRUE(blob_data_handle);
+  blob_data_handle.reset();
+
+  // Make sure it goes away in the end.
+  host.DecrementBlobRefCount(kId);
+  blob_data_handle = context.GetBlobDataFromUUID(kId);
+  EXPECT_FALSE(blob_data_handle);
+}
+
+TEST(BlobStorageContextTest, BlobDataHandle) {
+  BlobStorageContext context;
+  BlobStorageHost host(&context);
+  MessageLoop fake_io_message_loop;
+
+  // Build up a basic blob.
+  const std::string kId("id");
+  SetupBasicBlob(&host, kId);
+
+  // Get a handle to it.
+  scoped_ptr<BlobDataHandle> blob_data_handle =
+      context.GetBlobDataFromUUID(kId);
+  EXPECT_TRUE(blob_data_handle);
+
+  // Drop the host's ref to it.
+  host.DecrementBlobRefCount(kId);
+
+  // Should still be there due to the handle.
+  scoped_ptr<BlobDataHandle> another_handle =
+      context.GetBlobDataFromUUID(kId);
+  EXPECT_TRUE(another_handle);
+
+  // Should disappear after dropping both handles.
+  blob_data_handle.reset();
+  another_handle.reset();
+  blob_data_handle = context.GetBlobDataFromUUID(kId);
+  EXPECT_FALSE(blob_data_handle);
+}
+
+
+TEST(BlobStorageContextTest, CompoundBlobs) {
+  const std::string kId1("id1");
+  const std::string kId2("id2");
+  const std::string kId2Prime("id2.prime");
+
+  MessageLoop fake_io_message_loop;
+
   // Setup a set of blob data for testing.
   base::Time time1, time2;
   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());
+  scoped_refptr<BlobData> blob_data1(new BlobData(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());
+  scoped_refptr<BlobData> blob_data2(new BlobData(kId2));
   blob_data2->AppendData("Data3");
-  blob_data2->AppendBlob(GURL("blob://url_1"), 8, 100);
+  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());
+  scoped_refptr<BlobData> canonicalized_blob_data2(new BlobData(kId2Prime));
   canonicalized_blob_data2->AppendData("Data3");
   canonicalized_blob_data2->AppendData("a2___", 2);
   canonicalized_blob_data2->AppendFile(
@@ -39,39 +114,85 @@
   canonicalized_blob_data2->AppendFile(
       base::FilePath(FILE_PATH_LITERAL("File2.txt")), 0, 20, time2);
 
-  BlobStorageController blob_storage_controller;
+  BlobStorageContext context;
+  scoped_ptr<BlobDataHandle> blob_data_handle;
 
-  // Test registering a blob URL referring to the blob data containing only
-  // data and file.
-  GURL blob_url1("blob://url_1");
-  blob_storage_controller.AddFinishedBlob(blob_url1, blob_data1);
+  // Test a blob referring to only data and a file.
+  blob_data_handle = context.AddFinishedBlob(blob_data1);
+  ASSERT_TRUE(blob_data_handle.get());
+  EXPECT_TRUE(*(blob_data_handle->data()) == *blob_data1);
 
-  BlobData* blob_data_found =
-      blob_storage_controller.GetBlobDataFromUrl(blob_url1);
-  ASSERT_TRUE(blob_data_found != NULL);
-  EXPECT_TRUE(*blob_data_found == *blob_data1);
+  // Test a blob composed in part with another blob.
+  blob_data_handle = context.AddFinishedBlob(blob_data2);
+  ASSERT_TRUE(blob_data_handle.get());
+  EXPECT_TRUE(*(blob_data_handle->data()) ==*canonicalized_blob_data2);
+}
 
-  // Test registering a blob URL referring to the blob data containing data,
-  // file and blob.
-  GURL blob_url2("blob://url_2");
-  blob_storage_controller.AddFinishedBlob(blob_url2, blob_data2);
+TEST(BlobStorageContextTest, PublicBlobUrls) {
+  BlobStorageContext context;
+  BlobStorageHost host(&context);
+  MessageLoop fake_io_message_loop;
 
-  blob_data_found = blob_storage_controller.GetBlobDataFromUrl(blob_url2);
-  ASSERT_TRUE(blob_data_found != NULL);
-  EXPECT_TRUE(*blob_data_found == *canonicalized_blob_data2);
+  // Build up a basic blob.
+  const std::string kId("id");
+  SetupBasicBlob(&host, kId);
 
-  // Test registering a blob URL referring to existent blob URL.
-  GURL blob_url3("blob://url_3");
-  blob_storage_controller.CloneBlob(blob_url3, blob_url1);
+  // Now register a url for that blob.
+  GURL kUrl("blob:id");
+  host.RegisterPublicBlobURL(kUrl, kId);
+  scoped_ptr<BlobDataHandle> blob_data_handle =
+      context.GetBlobDataFromPublicURL(kUrl);
+  ASSERT_TRUE(blob_data_handle.get());
+  EXPECT_EQ(kId, blob_data_handle->data()->uuid());
+  blob_data_handle.reset();
 
-  blob_data_found = blob_storage_controller.GetBlobDataFromUrl(blob_url3);
-  ASSERT_TRUE(blob_data_found != NULL);
-  EXPECT_TRUE(*blob_data_found == *blob_data1);
+  // The url registration should keep the blob alive even after
+  // explicit references are dropped.
+  host.DecrementBlobRefCount(kId);
+  blob_data_handle = context.GetBlobDataFromPublicURL(kUrl);
+  EXPECT_TRUE(blob_data_handle);
+  blob_data_handle.reset();
 
-  // Test unregistering a blob URL.
-  blob_storage_controller.RemoveBlob(blob_url3);
-  blob_data_found = blob_storage_controller.GetBlobDataFromUrl(blob_url3);
-  EXPECT_TRUE(!blob_data_found);
+  // Finally get rid of the url registration and the blob.
+  host.RevokePublicBlobURL(kUrl);
+  blob_data_handle = context.GetBlobDataFromPublicURL(kUrl);
+  EXPECT_TRUE(!blob_data_handle.get());
 }
 
+TEST(BlobStorageContextTest, HostCleanup) {
+  BlobStorageContext context;
+  scoped_ptr<BlobStorageHost> host(new BlobStorageHost(&context));
+  MessageLoop fake_io_message_loop;
+
+  // Build up a basic blob and register a url
+  const std::string kId("id");
+  GURL kUrl("blob:id");
+  SetupBasicBlob(host.get(), kId);
+  host->RegisterPublicBlobURL(kUrl, kId);
+
+  // All should disappear upon host deletion.
+  host.reset();
+  scoped_ptr<BlobDataHandle> handle = context.GetBlobDataFromPublicURL(kUrl);
+  EXPECT_TRUE(!handle.get());
+  handle = context.GetBlobDataFromUUID(kId);
+  EXPECT_TRUE(!handle.get());
+}
+
+TEST(BlobStorageContextTest, EarlyContextDeletion) {
+  scoped_ptr<BlobStorageContext> context(new BlobStorageContext);
+  BlobStorageHost host(context.get());
+  MessageLoop fake_io_message_loop;
+
+  // Deleting the context should not induce crashes.
+  context.reset();
+
+  const std::string kId("id");
+  GURL kUrl("blob:id");
+  SetupBasicBlob(&host, kId);
+  host.RegisterPublicBlobURL(kUrl, kId);
+  host.IncrementBlobRefCount(kId);
+  host.DecrementBlobRefCount(kId);
+  host.RevokePublicBlobURL(kUrl);
+}
+
 }  // namespace webkit_blob