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

Unified Diff: Source/modules/serviceworkers/BodyStreamBufferTest.cpp

Issue 787793002: [ServiceWorker] Add contentType argument to BodyStreamBuffer::readAllAndCreateBlobHandle. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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 | « Source/modules/serviceworkers/BodyStreamBuffer.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/serviceworkers/BodyStreamBufferTest.cpp
diff --git a/Source/modules/serviceworkers/BodyStreamBufferTest.cpp b/Source/modules/serviceworkers/BodyStreamBufferTest.cpp
index e573710e4f27d6738eabddce001e0e41dc83a24d..009fa5519354f585f13ad30ff75c4d857c1dda63 100644
--- a/Source/modules/serviceworkers/BodyStreamBufferTest.cpp
+++ b/Source/modules/serviceworkers/BodyStreamBufferTest.cpp
@@ -140,14 +140,15 @@ TEST(BodyStreamBufferTest, CreateBlob)
BodyStreamBuffer* buffer = new BodyStreamBuffer();
BlobHandleCallback* callback1 = new BlobHandleCallback();
BlobHandleCallback* callback2 = new BlobHandleCallback();
- EXPECT_TRUE(buffer->readAllAndCreateBlobHandle(callback1));
- EXPECT_FALSE(buffer->readAllAndCreateBlobHandle(callback2));
+ EXPECT_TRUE(buffer->readAllAndCreateBlobHandle("text/html", callback1));
+ EXPECT_FALSE(buffer->readAllAndCreateBlobHandle("text/html", callback2));
buffer->write(DOMArrayBuffer::create("foobar", 6));
EXPECT_FALSE(callback1->blobHandle());
buffer->write(DOMArrayBuffer::create("piyo", 4));
EXPECT_FALSE(callback1->blobHandle());
buffer->close();
EXPECT_TRUE(callback1->blobHandle());
+ EXPECT_EQ("text/html", callback1->blobHandle()->type());
EXPECT_FALSE(callback2->blobHandle());
EXPECT_EQ(10u, callback1->blobHandle()->size());
WebVector<WebBlobData::Item*> items;
@@ -166,7 +167,7 @@ TEST(BodyStreamBufferTest, CreateBlobAfterWrite)
BodyStreamBuffer* buffer = new BodyStreamBuffer();
BlobHandleCallback* callback = new BlobHandleCallback();
buffer->write(DOMArrayBuffer::create("foobar", 6));
- EXPECT_TRUE(buffer->readAllAndCreateBlobHandle(callback));
+ EXPECT_TRUE(buffer->readAllAndCreateBlobHandle("", callback));
buffer->close();
EXPECT_TRUE(callback->blobHandle());
EXPECT_EQ(6u, callback->blobHandle()->size());
@@ -183,7 +184,7 @@ TEST(BodyStreamBufferTest, CreateBlobAfterClose)
BlobHandleCallback* callback = new BlobHandleCallback();
buffer->write(DOMArrayBuffer::create("foobar", 6));
buffer->close();
- EXPECT_TRUE(buffer->readAllAndCreateBlobHandle(callback));
+ EXPECT_TRUE(buffer->readAllAndCreateBlobHandle("", callback));
EXPECT_TRUE(callback->blobHandle());
EXPECT_EQ(6u, callback->blobHandle()->size());
WebVector<WebBlobData::Item*> items;
@@ -198,8 +199,8 @@ TEST(BodyStreamBufferTest, CreateBlobException)
BodyStreamBuffer* buffer = new BodyStreamBuffer();
BlobHandleCallback* callback1 = new BlobHandleCallback();
BlobHandleCallback* callback2 = new BlobHandleCallback();
- EXPECT_TRUE(buffer->readAllAndCreateBlobHandle(callback1));
- EXPECT_FALSE(buffer->readAllAndCreateBlobHandle(callback2));
+ EXPECT_TRUE(buffer->readAllAndCreateBlobHandle("", callback1));
+ EXPECT_FALSE(buffer->readAllAndCreateBlobHandle("", callback2));
buffer->write(DOMArrayBuffer::create("foobar", 6));
buffer->write(DOMArrayBuffer::create("piyo", 4));
EXPECT_FALSE(buffer->hasError());
@@ -218,7 +219,7 @@ TEST(BodyStreamBufferTest, CreateBlobExceptionAfterWrite)
BodyStreamBuffer* buffer = new BodyStreamBuffer();
BlobHandleCallback* callback = new BlobHandleCallback();
buffer->write(DOMArrayBuffer::create("foobar", 6));
- EXPECT_TRUE(buffer->readAllAndCreateBlobHandle(callback));
+ EXPECT_TRUE(buffer->readAllAndCreateBlobHandle("", callback));
buffer->error(DOMException::create(NetworkError, "Error Message"));
EXPECT_TRUE(callback->exception());
EXPECT_EQ("NetworkError", callback->exception()->name());
@@ -231,7 +232,7 @@ TEST(BodyStreamBufferTest, CreateBlobExceptionAfterError)
BlobHandleCallback* callback = new BlobHandleCallback();
buffer->write(DOMArrayBuffer::create("foobar", 6));
buffer->error(DOMException::create(NetworkError, "Error Message"));
- EXPECT_TRUE(buffer->readAllAndCreateBlobHandle(callback));
+ EXPECT_TRUE(buffer->readAllAndCreateBlobHandle("", callback));
EXPECT_TRUE(callback->exception());
EXPECT_EQ("NetworkError", callback->exception()->name());
EXPECT_EQ("Error Message", callback->exception()->message());
« no previous file with comments | « Source/modules/serviceworkers/BodyStreamBuffer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698