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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/resource_request_body_unittest.cc

Issue 11416382: ********** Content tests with blob hacking. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 8 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 | « webkit/fileapi/webfilewriter_base_unittest.cc ('k') | webkit/tools/test_shell/simple_file_system.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/resource_request_body_unittest.cc
===================================================================
--- webkit/glue/resource_request_body_unittest.cc (revision 186525)
+++ webkit/glue/resource_request_body_unittest.cc (working copy)
@@ -16,10 +16,10 @@
#include "net/base/upload_data_stream.h"
#include "net/base/upload_file_element_reader.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/blob/blob_storage_controller.h"
+#include "webkit/blob/blob_storage_context.h"
using webkit_blob::BlobData;
-using webkit_blob::BlobStorageController;
+using webkit_blob::BlobStorageContext;
namespace webkit_glue {
@@ -98,25 +98,19 @@
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);
+ const std::string blob_id0("id-0");
+ scoped_refptr<BlobData> blob_data(new BlobData(blob_id0));
+ 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);
+ blob_storage_context.AddFinishedBlob(blob_data);
- GURL blob_url1("blob://url_1");
- blob_storage_controller.AddFinishedBlob(blob_url1, blob_data);
-
- 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);
-
// Setup upload data elements for comparison.
ResourceRequestBody::Element blob_element1, blob_element2;
blob_element1.SetToBytes(
@@ -144,7 +138,7 @@
scoped_ptr<net::UploadDataStream> upload(
request_body->ResolveElementsAndCreateUploadDataStream(
- &blob_storage_controller, NULL, base::MessageLoopProxy::current()));
+ &blob_storage_context, NULL, base::MessageLoopProxy::current()));
ASSERT_EQ(2U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
@@ -152,25 +146,25 @@
// 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.reset(request_body->ResolveElementsAndCreateUploadDataStream(
- &blob_storage_controller, NULL, base::MessageLoopProxy::current()));
+ &blob_storage_context, NULL, base::MessageLoopProxy::current()));
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.reset(request_body->ResolveElementsAndCreateUploadDataStream(
- &blob_storage_controller, NULL, base::MessageLoopProxy::current()));
+ &blob_storage_context, NULL, base::MessageLoopProxy::current()));
ASSERT_EQ(2U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
// 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(),
@@ -178,7 +172,7 @@
upload_element2.expected_modification_time());
upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
- &blob_storage_controller, NULL, base::MessageLoopProxy::current()));
+ &blob_storage_context, NULL, base::MessageLoopProxy::current()));
ASSERT_EQ(4U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
@@ -192,10 +186,10 @@
upload_element2.offset(),
upload_element2.length(),
upload_element2.expected_modification_time());
- request_body->AppendBlob(blob_url1);
+ request_body->AppendBlob(blob_id1);
upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
- &blob_storage_controller, NULL, base::MessageLoopProxy::current()));
+ &blob_storage_context, NULL, base::MessageLoopProxy::current()));
ASSERT_EQ(4U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], upload_element2));
@@ -205,14 +199,14 @@
// 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(),
upload_element2.expected_modification_time());
upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
- &blob_storage_controller, NULL, base::MessageLoopProxy::current()));
+ &blob_storage_context, NULL, base::MessageLoopProxy::current()));
ASSERT_EQ(4U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element1));
@@ -221,17 +215,17 @@
// 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(),
upload_element2.expected_modification_time());
upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
- &blob_storage_controller, NULL, base::MessageLoopProxy::current()));
+ &blob_storage_context, NULL, base::MessageLoopProxy::current()));
ASSERT_EQ(8U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
« no previous file with comments | « webkit/fileapi/webfilewriter_base_unittest.cc ('k') | webkit/tools/test_shell/simple_file_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698