[ServiceWorker] Add contentType argument to BodyStreamBuffer::readAllAndCreateBlobHandle.

Source/modules/serviceworkers/BodyStreamBufferTest.cpp

Index: Source/modules/serviceworkers/BodyStreamBufferTest.cpp
diff --git a/Source/modules/serviceworkers/BodyStreamBufferTest.cpp b/Source/modules/serviceworkers/BodyStreamBufferTest.cpp
index a5cc6ae76ed0847ef708697e24d4e231154cc3d0..b07bceb9a6a9ac9a266eb343dc14e2d79174cafe 100644
--- a/Source/modules/serviceworkers/BodyStreamBufferTest.cpp
+++ b/Source/modules/serviceworkers/BodyStreamBufferTest.cpp
@@ -77,9 +77,17 @@ private:
 
 } // namespace
 
+TEST(BodyStreamBufferTest, ContentType)
+{
+    BodyStreamBuffer* buffer1 = new BodyStreamBuffer(String());
+    EXPECT_TRUE(buffer1->contentType().isEmpty());
+    BodyStreamBuffer* buffer2 = new BodyStreamBuffer("text/html");
+    EXPECT_EQ("text/html", buffer2->contentType());
+}
+
 TEST(BodyStreamBufferTest, Read)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer();
+    BodyStreamBuffer* buffer = new BodyStreamBuffer(String());
     RefPtr<DOMArrayBuffer> arrayBuffer1 = DOMArrayBuffer::create("foobar", 6);
     RefPtr<DOMArrayBuffer> arrayBuffer2 = DOMArrayBuffer::create("abc", 3);
     RefPtr<DOMArrayBuffer> arrayBuffer3 = DOMArrayBuffer::create("piyo", 4);
@@ -95,7 +103,7 @@ TEST(BodyStreamBufferTest, Read)
 
 TEST(BodyStreamBufferTest, Exception)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer();
+    BodyStreamBuffer* buffer = new BodyStreamBuffer(String());
     EXPECT_FALSE(buffer->exception());
     buffer->error(DOMException::create(NetworkError, "Error Message"));
     EXPECT_TRUE(buffer->exception());
@@ -105,7 +113,7 @@ TEST(BodyStreamBufferTest, Exception)
 
 TEST(BodyStreamBufferTest, Observer)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer();
+    BodyStreamBuffer* buffer = new BodyStreamBuffer(String());
     MockObserver* observer1 = new MockObserver();
     MockObserver* observer2 = new MockObserver();
     EXPECT_TRUE(buffer->registerObserver(observer1));
@@ -134,7 +142,7 @@ TEST(BodyStreamBufferTest, Observer)
 
 TEST(BodyStreamBufferTest, CreateBlob)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer();
+    BodyStreamBuffer* buffer = new BodyStreamBuffer("text/plain");
     BlobHandleCallback* callback1 = new BlobHandleCallback();
     BlobHandleCallback* callback2 = new BlobHandleCallback();
     EXPECT_TRUE(buffer->readAllAndCreateBlobHandle(callback1));
@@ -147,6 +155,7 @@ TEST(BodyStreamBufferTest, CreateBlob)
     EXPECT_TRUE(callback1->blobHandle());
     EXPECT_FALSE(callback2->blobHandle());
     EXPECT_EQ(10u, callback1->blobHandle()->size());
+    EXPECT_EQ("text/plain", callback1->blobHandle()->type());
     // FIXME: Check the content of the blob.
     EXPECT_FALSE(callback1->exception());
     EXPECT_FALSE(callback2->exception());
@@ -154,7 +163,7 @@ TEST(BodyStreamBufferTest, CreateBlob)
 
 TEST(BodyStreamBufferTest, CreateBlobAfterWrite)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer();
+    BodyStreamBuffer* buffer = new BodyStreamBuffer(String());
     BlobHandleCallback* callback = new BlobHandleCallback();
     buffer->write(DOMArrayBuffer::create("foobar", 6));
     EXPECT_TRUE(buffer->readAllAndCreateBlobHandle(callback));
@@ -166,7 +175,7 @@ TEST(BodyStreamBufferTest, CreateBlobAfterWrite)
 
 TEST(BodyStreamBufferTest, CreateBlobAfterClose)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer();
+    BodyStreamBuffer* buffer = new BodyStreamBuffer(String());
     BlobHandleCallback* callback = new BlobHandleCallback();
     buffer->write(DOMArrayBuffer::create("foobar", 6));
     buffer->close();
@@ -178,7 +187,7 @@ TEST(BodyStreamBufferTest, CreateBlobAfterClose)
 
 TEST(BodyStreamBufferTest, CreateBlobException)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer();
+    BodyStreamBuffer* buffer = new BodyStreamBuffer(String());
     BlobHandleCallback* callback1 = new BlobHandleCallback();
     BlobHandleCallback* callback2 = new BlobHandleCallback();
     EXPECT_TRUE(buffer->readAllAndCreateBlobHandle(callback1));
@@ -198,7 +207,7 @@ TEST(BodyStreamBufferTest, CreateBlobException)
 
 TEST(BodyStreamBufferTest, CreateBlobExceptionAfterWrite)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer();
+    BodyStreamBuffer* buffer = new BodyStreamBuffer(String());
     BlobHandleCallback* callback = new BlobHandleCallback();
     buffer->write(DOMArrayBuffer::create("foobar", 6));
     EXPECT_TRUE(buffer->readAllAndCreateBlobHandle(callback));
@@ -210,7 +219,7 @@ TEST(BodyStreamBufferTest, CreateBlobExceptionAfterWrite)
 
 TEST(BodyStreamBufferTest, CreateBlobExceptionAfterError)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer();
+    BodyStreamBuffer* buffer = new BodyStreamBuffer(String());
     BlobHandleCallback* callback = new BlobHandleCallback();
     buffer->write(DOMArrayBuffer::create("foobar", 6));
     buffer->error(DOMException::create(NetworkError, "Error Message"));