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,39 @@
 #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) {
+TEST(BlobStorageContextTest, BlobStorageContext) {
+  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 +46,33 @@
   canonicalized_blob_data2->AppendFile(
       base::FilePath(FILE_PATH_LITERAL("File2.txt")), 0, 20, time2);
 
-  BlobStorageController blob_storage_controller;
+  BlobStorageContext context;
+  BlobStorageHost host(&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.
+  host.AddFinishedBlob(blob_data1);
+  blob_data_handle = context.GetBlobDataFromUUID(kId1);
+  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.
+  host.AddFinishedBlob(blob_data2);
+  blob_data_handle = context.GetBlobDataFromUUID(kId2);
+  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);
+  // Make sure url registration/unregistration works.
+  GURL kUrl1("blob:id1");
+  host.RegisterPublicBlobURL(kUrl1, kId1);
+  blob_data_handle = context.GetBlobDataFromPublicURL(kUrl1);
+  ASSERT_TRUE(blob_data_handle.get());
+  EXPECT_EQ(kId1, blob_data_handle->data()->uuid());
+  host.RevokePublicBlobURL(kUrl1);
+  blob_data_handle = context.GetBlobDataFromPublicURL(kUrl1);
+  EXPECT_TRUE(!blob_data_handle.get());
 
-  blob_data_found = blob_storage_controller.GetBlobDataFromUrl(blob_url2);
-  ASSERT_TRUE(blob_data_found != NULL);
-  EXPECT_TRUE(*blob_data_found == *canonicalized_blob_data2);
-
-  // Test registering a blob URL referring to existent blob URL.
-  GURL blob_url3("blob://url_3");
-  blob_storage_controller.CloneBlob(blob_url3, blob_url1);
-
-  blob_data_found = blob_storage_controller.GetBlobDataFromUrl(blob_url3);
-  ASSERT_TRUE(blob_data_found != NULL);
-  EXPECT_TRUE(*blob_data_found == *blob_data1);
-
-  // 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);
+  // Make sure add/remove ref

[michaeln, 2013/04/17 01:23:48]

Need to flesh out more tests
- add/remove ref
- host cleanup logic (cleaning up blobs in use in the deleted host)
- weakptr behavior if context is deleted prior to host

 }
 
 }  // namespace webkit_blob