[Fetch API] Remove DrainingBuffer.

Source/modules/fetch/ResponseTest.cpp

Index: Source/modules/fetch/ResponseTest.cpp
diff --git a/Source/modules/fetch/ResponseTest.cpp b/Source/modules/fetch/ResponseTest.cpp
index 4e1829589ebe0d88858c4030c97e881a50c9862c..a25f04ba33bc6edeea593bfae285ddd3a9e52b06 100644
--- a/Source/modules/fetch/ResponseTest.cpp
+++ b/Source/modules/fetch/ResponseTest.cpp
@@ -145,45 +145,46 @@ TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseOpaque)
     EXPECT_FALSE(exceptionState.hadException());
 }
 
-void loadInternalBufferAsString(Response* response, FetchDataLoader::Client* client)
-{
-    FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsString();
-    OwnPtr<DrainingBodyStreamBuffer> buffer = response->createInternalDrainingStream();
-    buffer->startLoading(fetchDataLoader, client);
-}
-
 void checkResponseStream(Response* response, bool checkResponseBodyStreamBuffer)
 {
-    void* buffer = response->internalBufferForTest();
+    if (!response->bodyBuffer())
+        FAIL() << "bodyBuffer() must not be null.";
+    BodyStreamBuffer* originalInternal = response->internalBodyBuffer();
     if (checkResponseBodyStreamBuffer) {
-        EXPECT_EQ(response->bufferForTest(), buffer);
+        EXPECT_EQ(response->bodyBuffer(), originalInternal);
     } else {
-        EXPECT_FALSE(response->bufferForTest());
+        EXPECT_FALSE(response->bodyBuffer()->hasBody());
     }
 
     TrackExceptionState exceptionState;
     Response* clonedResponse = response->clone(exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
 
-    EXPECT_TRUE(response->internalBufferForTest());
-    EXPECT_TRUE(clonedResponse->internalBufferForTest());
-    EXPECT_NE(response->internalBufferForTest(), buffer);
-    EXPECT_NE(clonedResponse->internalBufferForTest(), buffer);
-    EXPECT_NE(response->internalBufferForTest(), clonedResponse->internalBufferForTest());
+    if (!response->internalBodyBuffer())
+        FAIL() << "internalBodyBuffer() must not be null.";
+    if (!clonedResponse->internalBodyBuffer())
+        FAIL() << "internalBodyBuffer() must not be null.";
+    EXPECT_TRUE(response->internalBodyBuffer());
+    EXPECT_TRUE(clonedResponse->internalBodyBuffer());
+    EXPECT_TRUE(response->internalBodyBuffer()->hasBody());
+    EXPECT_TRUE(clonedResponse->internalBodyBuffer()->hasBody());
+    EXPECT_NE(response->internalBodyBuffer(), originalInternal);
+    EXPECT_NE(clonedResponse->internalBodyBuffer(), originalInternal);
+    EXPECT_NE(response->internalBodyBuffer(), clonedResponse->internalBodyBuffer());
     if (checkResponseBodyStreamBuffer) {
-        EXPECT_EQ(response->bufferForTest(), response->internalBufferForTest());
-        EXPECT_EQ(clonedResponse->bufferForTest(), clonedResponse->internalBufferForTest());
+        EXPECT_EQ(response->bodyBuffer(), response->internalBodyBuffer());
+        EXPECT_EQ(clonedResponse->bodyBuffer(), clonedResponse->internalBodyBuffer());
     } else {
-        EXPECT_FALSE(response->bufferForTest());
-        EXPECT_FALSE(clonedResponse->bufferForTest());
+        EXPECT_FALSE(response->bodyBuffer()->hasBody());
+        EXPECT_FALSE(clonedResponse->bodyBuffer()->hasBody());
     }
     DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client1 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
     DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client2 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
     EXPECT_CALL(*client1, didFetchDataLoadedString(String("Hello, world")));
     EXPECT_CALL(*client2, didFetchDataLoadedString(String("Hello, world")));
 
-    loadInternalBufferAsString(response, client1);
-    loadInternalBufferAsString(clonedResponse, client2);
+    response->internalBodyBuffer()->startLoading(response->executionContext(), FetchDataLoader::createLoaderAsString(), client1);
+    clonedResponse->internalBodyBuffer()->startLoading(response->executionContext(), FetchDataLoader::createLoaderAsString(), client2);
     blink::testing::runPendingTasks();
 }
 
@@ -194,7 +195,7 @@ BodyStreamBuffer* createHelloWorldBuffer()
     src->add(Command(Command::Data, "Hello, "));
     src->add(Command(Command::Data, "world"));
     src->add(Command(Command::Done));
-    return BodyStreamBuffer::create(createFetchDataConsumerHandleFromWebHandle(src.release()));
+    return new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(src.release()));
 }
 
 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneDefault)
@@ -203,7 +204,7 @@ TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneDefault)
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     Response* response = Response::create(executionContext(), fetchResponseData);
-    EXPECT_EQ(response->internalBufferForTest(), buffer);
+    EXPECT_EQ(response->internalBodyBuffer(), buffer);
     checkResponseStream(response, true);
 }
 
@@ -214,7 +215,7 @@ TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneBasic)
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     fetchResponseData = fetchResponseData->createBasicFilteredResponse();
     Response* response = Response::create(executionContext(), fetchResponseData);
-    EXPECT_EQ(response->internalBufferForTest(), buffer);
+    EXPECT_EQ(response->internalBodyBuffer(), buffer);
     checkResponseStream(response, true);
 }
 
@@ -225,7 +226,7 @@ TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneCORS)
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     fetchResponseData = fetchResponseData->createCORSFilteredResponse();
     Response* response = Response::create(executionContext(), fetchResponseData);
-    EXPECT_EQ(response->internalBufferForTest(), buffer);
+    EXPECT_EQ(response->internalBodyBuffer(), buffer);
     checkResponseStream(response, true);
 }
 
@@ -236,13 +237,13 @@ TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneOpaque)
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     fetchResponseData = fetchResponseData->createOpaqueFilteredResponse();
     Response* response = Response::create(executionContext(), fetchResponseData);
-    EXPECT_EQ(response->internalBufferForTest(), buffer);
+    EXPECT_EQ(response->internalBodyBuffer(), buffer);
     checkResponseStream(response, false);
 }
 
 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneError)
 {
-    BodyStreamBuffer* buffer = BodyStreamBuffer::create(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
+    BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     Response* response = Response::create(executionContext(), fetchResponseData);
@@ -255,8 +256,8 @@ TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneError)
     EXPECT_CALL(*client1, didFetchDataLoadFailed());
     EXPECT_CALL(*client2, didFetchDataLoadFailed());
 
-    loadInternalBufferAsString(response, client1);
-    loadInternalBufferAsString(clonedResponse, client2);
+    response->internalBodyBuffer()->startLoading(response->executionContext(), FetchDataLoader::createLoaderAsString(), client1);
+    clonedResponse->internalBodyBuffer()->startLoading(response->executionContext(), FetchDataLoader::createLoaderAsString(), client2);
     blink::testing::runPendingTasks();
 }