[Fetch API] Remove DrainingBuffer.

Source/modules/fetch/ResponseTest.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/fetch/Response.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/Document.h"
@@ skipping 127 matching lines @@
     Response* response = Response::create(executionContext(), *webResponse);
 
     Headers* responseHeaders = response->headers();
     TrackExceptionState exceptionState;
     EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().data());
     EXPECT_STREQ("", responseHeaders->get("foo", exceptionState).utf8().data());
     EXPECT_STREQ("", responseHeaders->get("cache-control", exceptionState).utf8().data());
     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();
+    void* buffer = response->internalBodyBuffer();

[hiroshige, 2015/07/24 12:47:03]

optional: should we add ASSERT_TRUE(response->bodyBuffer()) here and other
locations where e.g. we call bodyBuffer()->hasBody() without asserting
bodyBuffer() is non-null?

[yhirano, 2015/07/29 08:45:02]

I think we cannot place ASSERT_* here.

     if (checkResponseBodyStreamBuffer) {
-        EXPECT_EQ(response->bufferForTest(), buffer);
+        EXPECT_EQ(response->bodyBuffer(), buffer);
     } 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());
+    EXPECT_TRUE(response->internalBodyBuffer());
+    EXPECT_TRUE(clonedResponse->internalBodyBuffer());

[hiroshige, 2015/07/24 12:47:03]

Should we also add
EXPECT_TRUE(response|clonedResponse->internalBodyBuffer()->hasBody());?
(EXPECT_TRUE(internalBufferForTest()) corresponds to
EXPECT_TRUE(internalBodyBuffer()->hasBody()))

[yhirano, 2015/07/29 08:45:02]

Done.

+    EXPECT_NE(response->internalBodyBuffer(), buffer);
+    EXPECT_NE(clonedResponse->internalBodyBuffer(), buffer);
+    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();
 }
 
 BodyStreamBuffer* createHelloWorldBuffer()
 {
     using Command = DataConsumerHandleTestUtil::Command;
     OwnPtr<DataConsumerHandleTestUtil::ReplayingHandle> src(DataConsumerHandleTestUtil::ReplayingHandle::create());
     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)
 {
     BodyStreamBuffer* buffer = createHelloWorldBuffer();
     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);
 }
 
 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneBasic)
 {
     BodyStreamBuffer* buffer = createHelloWorldBuffer();
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     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);
 }
 
 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneCORS)
 {
     BodyStreamBuffer* buffer = createHelloWorldBuffer();
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     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);
 }
 
 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneOpaque)
 {
     BodyStreamBuffer* buffer = createHelloWorldBuffer();
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     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);
     TrackExceptionState exceptionState;
     Response* clonedResponse = response->clone(exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
 
     DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client1 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
     DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client2 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
     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();
 }
 
 } // namespace
 } // namespace blink