Stop FetchDataLoaderTest from using [Web|Fetch]DataConsumerHandle.

third_party/WebKit/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 "modules/fetch/Response.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "core/dom/Document.h"
 #include "core/frame/Frame.h"
 #include "core/testing/DummyPageHolder.h"
 #include "modules/fetch/BodyStreamBuffer.h"
+#include "modules/fetch/BytesConsumerTestUtil.h"
 #include "modules/fetch/DataConsumerHandleTestUtil.h"
 #include "modules/fetch/DataConsumerHandleUtil.h"
 #include "modules/fetch/FetchResponseData.h"
 #include "platform/blob/BlobData.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerResponse.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
@@ skipping 139 matching lines @@
     EXPECT_NE(response->internalBodyBuffer(), originalInternal);
     EXPECT_NE(clonedResponse->internalBodyBuffer(), originalInternal);
     EXPECT_NE(response->internalBodyBuffer(), clonedResponse->internalBodyBuffer());
     if (checkResponseBodyStreamBuffer) {
         EXPECT_EQ(response->bodyBuffer(), response->internalBodyBuffer());
         EXPECT_EQ(clonedResponse->bodyBuffer(), clonedResponse->internalBodyBuffer());
     } else {
         EXPECT_FALSE(response->bodyBuffer());
         EXPECT_FALSE(clonedResponse->bodyBuffer());
     }
-    DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client1 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
-    DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client2 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
+    BytesConsumerTestUtil::MockFetchDataLoaderClient* client1 = new BytesConsumerTestUtil::MockFetchDataLoaderClient();
+    BytesConsumerTestUtil::MockFetchDataLoaderClient* client2 = new BytesConsumerTestUtil::MockFetchDataLoaderClient();
     EXPECT_CALL(*client1, didFetchDataLoadedString(String("Hello, world")));
     EXPECT_CALL(*client2, didFetchDataLoadedString(String("Hello, world")));
 
     response->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAsString(), client1);
     clonedResponse->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAsString(), client2);
     blink::testing::runPendingTasks();
 }
 
 BodyStreamBuffer* createHelloWorldBuffer(ScriptState* scriptState)
 {
@@ skipping 56 matching lines @@
 {
     V8TestingScope scope;
     BodyStreamBuffer* buffer = new BodyStreamBuffer(scope.getScriptState(), createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     Response* response = Response::create(scope.getExecutionContext(), fetchResponseData);
     TrackExceptionState exceptionState;
     Response* clonedResponse = response->clone(scope.getScriptState(), exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
 
-    DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client1 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
-    DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client2 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
+    BytesConsumerTestUtil::MockFetchDataLoaderClient* client1 = new BytesConsumerTestUtil::MockFetchDataLoaderClient();
+    BytesConsumerTestUtil::MockFetchDataLoaderClient* client2 = new BytesConsumerTestUtil::MockFetchDataLoaderClient();
     EXPECT_CALL(*client1, didFetchDataLoadFailed());
     EXPECT_CALL(*client2, didFetchDataLoadFailed());
 
     response->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAsString(), client1);
     clonedResponse->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAsString(), client2);
     blink::testing::runPendingTasks();
 }
 
 } // namespace
 } // namespace blink