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

Source/modules/serviceworkers/BodyStreamBufferTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/serviceworkers/BodyStreamBuffer.h"
 
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 122 matching lines @@
     EXPECT_EQ(0, observer2->writeCount());
     EXPECT_EQ(0, observer2->closeCount());
     EXPECT_EQ(0, observer2->errorCount());
 }
 
 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;
     EXPECT_TRUE(Platform::current()->unitTestSupport()->getBlobItems(callback1->blobHandle()->uuid(), &items));
     EXPECT_EQ(2u, items.size());
     EXPECT_EQ(6u, items[0]->data.size());
     EXPECT_EQ(0, memcmp(items[0]->data.data(), "foobar", 6));
     EXPECT_EQ(4u, items[1]->data.size());
     EXPECT_EQ(0, memcmp(items[1]->data.data(), "piyo", 4));
     EXPECT_FALSE(callback1->exception());
     EXPECT_FALSE(callback2->exception());
 }
 
 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());
     WebVector<WebBlobData::Item*> items;
     EXPECT_TRUE(Platform::current()->unitTestSupport()->getBlobItems(callback->blobHandle()->uuid(), &items));
     EXPECT_EQ(1u, items.size());
     EXPECT_EQ(6u, items[0]->data.size());
     EXPECT_EQ(0, memcmp(items[0]->data.data(), "foobar", 6));
 }
 
 TEST(BodyStreamBufferTest, CreateBlobAfterClose)
 {
     BodyStreamBuffer* buffer = new BodyStreamBuffer();
     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;
     EXPECT_TRUE(Platform::current()->unitTestSupport()->getBlobItems(callback->blobHandle()->uuid(), &items));
     EXPECT_EQ(1u, items.size());
     EXPECT_EQ(6u, items[0]->data.size());
     EXPECT_EQ(0, memcmp(items[0]->data.data(), "foobar", 6));
 }
 
 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());
     buffer->error(DOMException::create(NetworkError, "Error Message"));
     EXPECT_TRUE(buffer->hasError());
     EXPECT_FALSE(callback1->blobHandle());
     EXPECT_FALSE(callback2->blobHandle());
     EXPECT_TRUE(callback1->exception());
     EXPECT_FALSE(callback2->exception());
     EXPECT_EQ("NetworkError", callback1->exception()->name());
     EXPECT_EQ("Error Message", callback1->exception()->message());
 }
 
 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());
     EXPECT_EQ("Error Message", callback->exception()->message());
 }
 
 TEST(BodyStreamBufferTest, CreateBlobExceptionAfterError)
 {
     BodyStreamBuffer* buffer = new BodyStreamBuffer();
     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());
 }
 
 } // namespace blink