summaryrefslogtreecommitdiffstats
path: root/net/base/upload_data_unittest.cc
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 08:20:57 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 08:20:57 +0000
commit611a071344e691fdc368593ae0deaf15ab1ce34c (patch)
tree2f82ac7e9b295db2983f28d891caa94954416415 /net/base/upload_data_unittest.cc
parent2c03980fa0873647293a0e8fade9b6d0adc1193c (diff)
downloadchromium_src-611a071344e691fdc368593ae0deaf15ab1ce34c.zip
chromium_src-611a071344e691fdc368593ae0deaf15ab1ce34c.tar.gz
chromium_src-611a071344e691fdc368593ae0deaf15ab1ce34c.tar.bz2
Revert 152528 - Split net::UploadData into two: for resource request IPC and for upload handling
Introducing webkit_glue::ResourceRequestBody as a content-level abstraction corresponding to WebHTTPBody and as an alternative of net::UploadData in ResourceRequest. This interface can contain content-level objects like Blob (or FileSystem URL in later patches) while net::UploadData should NOT. This patch also removes Blob support in net::UploadData. BUG=110119 TEST=existing tests Review URL: https://chromiumcodereview.appspot.com/10834289 TBR=kinuko@chromium.org Review URL: https://chromiumcodereview.appspot.com/10831402 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/upload_data_unittest.cc')
-rw-r--r--net/base/upload_data_unittest.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/base/upload_data_unittest.cc b/net/base/upload_data_unittest.cc
index 98bb23d..63636a2 100644
--- a/net/base/upload_data_unittest.cc
+++ b/net/base/upload_data_unittest.cc
@@ -103,6 +103,12 @@ TEST_F(UploadDataTest, IsInMemory_File) {
ASSERT_FALSE(upload_data_->IsInMemory());
}
+TEST_F(UploadDataTest, IsInMemory_Blob) {
+ upload_data_->AppendBlob(GURL("blog:internal:12345"));
+ // Until it's resolved, we don't know what blob contains.
+ ASSERT_FALSE(upload_data_->IsInMemory());
+}
+
TEST_F(UploadDataTest, IsInMemory_Chunk) {
upload_data_->set_is_chunked(true);
ASSERT_FALSE(upload_data_->IsInMemory());
@@ -143,6 +149,11 @@ TEST_F(UploadDataTest, GetContentLength_File) {
ASSERT_EQ(kData.size(), callback.WaitForResult());
}
+TEST_F(UploadDataTest, GetContentLength_Blob) {
+ upload_data_->AppendBlob(GURL("blog:internal:12345"));
+ ASSERT_EQ(0U, upload_data_->GetContentLengthSync());
+}
+
TEST_F(UploadDataTest, GetContentLength_Chunk) {
upload_data_->set_is_chunked(true);
ASSERT_EQ(0U, upload_data_->GetContentLengthSync());