Stop FetchDataLoaderTest from using [Web|Fetch]DataConsumerHandle.

third_party/WebKit/Source/modules/fetch/ResponseTest.cpp

Index: third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp b/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
index d9aa422341c96e2ec6dfe3160d3e54571e97ca85..60b80a2dfc24c6bc97a4b92b6bb4f43e473acaf9 100644
--- a/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
+++ b/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
@@ -11,6 +11,7 @@
 #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"
@@ -170,8 +171,8 @@ void checkResponseStream(ScriptState* scriptState, Response* response, bool chec
         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")));
 
@@ -248,8 +249,8 @@ TEST(ServiceWorkerResponseTest, BodyStreamBufferCloneError)
     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());