Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1415)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/loader/upload_data_stream_builder_unittest.cc

Issue 23223003: Chromium Blob hacking (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/loader/upload_data_stream_builder.cc ('k') | content/browser/net/view_blob_internals_job_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/upload_data_stream_builder_unittest.cc
diff --git a/content/browser/loader/upload_data_stream_builder_unittest.cc b/content/browser/loader/upload_data_stream_builder_unittest.cc
index 9972418a06d3fba2cb02e56ff5ff0afbd2628c6b..4c9661cbee6a55e0af043513a92c0a36c891233e 100644
--- a/content/browser/loader/upload_data_stream_builder_unittest.cc
+++ b/content/browser/loader/upload_data_stream_builder_unittest.cc
@@ -16,11 +16,12 @@
#include "net/base/upload_file_element_reader.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
-#include "webkit/browser/blob/blob_storage_controller.h"
+#include "webkit/browser/blob/blob_storage_context.h"
#include "webkit/common/resource_request_body.h"
using webkit_blob::BlobData;
-using webkit_blob::BlobStorageController;
+using webkit_blob::BlobDataHandle;
+using webkit_blob::BlobStorageContext;
using webkit_glue::ResourceRequestBody;
namespace content {
@@ -98,24 +99,20 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
base::Time::FromString("Tue, 15 Nov 1994, 12:45:26 GMT", &time1);
base::Time::FromString("Mon, 14 Nov 1994, 11:30:49 GMT", &time2);
- BlobStorageController blob_storage_controller;
- scoped_refptr<BlobData> blob_data(new BlobData());
+ BlobStorageContext blob_storage_context;
- GURL blob_url0("blob://url_0");
- blob_storage_controller.AddFinishedBlob(blob_url0, blob_data.get());
+ const std::string blob_id0("id-0");
+ scoped_refptr<BlobData> blob_data(new BlobData(blob_id0));
+ scoped_ptr<BlobDataHandle> handle1 =
+ blob_storage_context.AddFinishedBlob(blob_data);
+ const std::string blob_id1("id-1");
+ blob_data = new BlobData(blob_id1);
blob_data->AppendData("BlobData");
blob_data->AppendFile(
base::FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1);
-
- GURL blob_url1("blob://url_1");
- blob_storage_controller.AddFinishedBlob(blob_url1, blob_data.get());
-
- GURL blob_url2("blob://url_2");
- blob_storage_controller.CloneBlob(blob_url2, blob_url1);
-
- GURL blob_url3("blob://url_3");
- blob_storage_controller.CloneBlob(blob_url3, blob_url2);
+ scoped_ptr<BlobDataHandle> handle2 =
+ blob_storage_context.AddFinishedBlob(blob_data);
// Setup upload data elements for comparison.
ResourceRequestBody::Element blob_element1, blob_element2;
@@ -144,7 +141,7 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
scoped_ptr<net::UploadDataStream> upload(
UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_controller,
+ &blob_storage_context,
NULL,
base::MessageLoopProxy::current().get()));
@@ -154,22 +151,22 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
// Test having only one blob reference that refers to empty blob data.
request_body = new ResourceRequestBody();
- request_body->AppendBlob(blob_url0);
+ request_body->AppendBlob(blob_id0);
upload =
UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_controller,
+ &blob_storage_context,
NULL,
base::MessageLoopProxy::current().get());
ASSERT_EQ(0U, upload->element_readers().size());
// Test having only one blob reference.
request_body = new ResourceRequestBody();
- request_body->AppendBlob(blob_url1);
+ request_body->AppendBlob(blob_id1);
upload =
UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_controller,
+ &blob_storage_context,
NULL,
base::MessageLoopProxy::current().get());
ASSERT_EQ(2U, upload->element_readers().size());
@@ -178,7 +175,7 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
// Test having one blob reference at the beginning.
request_body = new ResourceRequestBody();
- request_body->AppendBlob(blob_url1);
+ request_body->AppendBlob(blob_id1);
request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
request_body->AppendFileRange(upload_element2.path(),
upload_element2.offset(),
@@ -187,7 +184,7 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload =
UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_controller,
+ &blob_storage_context,
NULL,
base::MessageLoopProxy::current().get());
ASSERT_EQ(4U, upload->element_readers().size());
@@ -203,11 +200,11 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.offset(),
upload_element2.length(),
upload_element2.expected_modification_time());
- request_body->AppendBlob(blob_url1);
+ request_body->AppendBlob(blob_id1);
upload =
UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_controller,
+ &blob_storage_context,
NULL,
base::MessageLoopProxy::current().get());
ASSERT_EQ(4U, upload->element_readers().size());
@@ -219,7 +216,7 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
// Test having one blob reference in the middle.
request_body = new ResourceRequestBody();
request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
- request_body->AppendBlob(blob_url1);
+ request_body->AppendBlob(blob_id1);
request_body->AppendFileRange(upload_element2.path(),
upload_element2.offset(),
upload_element2.length(),
@@ -227,7 +224,7 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload =
UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_controller,
+ &blob_storage_context,
NULL,
base::MessageLoopProxy::current().get());
ASSERT_EQ(4U, upload->element_readers().size());
@@ -238,10 +235,10 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
// Test having multiple blob references.
request_body = new ResourceRequestBody();
- request_body->AppendBlob(blob_url1);
+ request_body->AppendBlob(blob_id1);
request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
- request_body->AppendBlob(blob_url2);
- request_body->AppendBlob(blob_url3);
+ request_body->AppendBlob(blob_id1);
+ request_body->AppendBlob(blob_id1);
request_body->AppendFileRange(upload_element2.path(),
upload_element2.offset(),
upload_element2.length(),
@@ -249,7 +246,7 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload =
UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_controller,
+ &blob_storage_context,
NULL,
base::MessageLoopProxy::current().get());
ASSERT_EQ(8U, upload->element_readers().size());
« no previous file with comments | « content/browser/loader/upload_data_stream_builder.cc ('k') | content/browser/net/view_blob_internals_job_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698