Remove Fetch[Blob|FormData]ConsumerHandle

third_party/WebKit/Source/modules/cachestorage/CacheTest.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/cachestorage/Cache.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/modules/v8/V8Request.h"
 #include "bindings/modules/v8/V8Response.h"
 #include "core/dom/Document.h"
 #include "core/frame/Frame.h"
 #include "core/testing/DummyPageHolder.h"
 #include "modules/fetch/BodyStreamBuffer.h"
-#include "modules/fetch/FetchFormDataConsumerHandle.h"
+#include "modules/fetch/FormDataBytesConsumer.h"
 #include "modules/fetch/GlobalFetch.h"
 #include "modules/fetch/Request.h"
 #include "modules/fetch/Response.h"
 #include "modules/fetch/ResponseInit.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerCache.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PtrUtil.h"
 #include <algorithm>
 #include <memory>
@@ skipping 589 matching lines @@
     const String url = "http://www.cacheadd.test/";
     const String contentType = "text/plain";
     const String content = "hello cache";
 
     ErrorWebCacheForTests* testCache;
     Cache* cache = createCache(fetcher, testCache = new NotImplementedErrorCache());
 
     fetcher->setExpectedFetchUrl(&url);
 
     Request* request = newRequestFromUrl(url);
-    Response* response = Response::create(getScriptState(), new BodyStreamBuffer(getScriptState(), FetchFormDataConsumerHandle::create(content)), contentType, ResponseInit(), exceptionState);
+    Response* response = Response::create(getScriptState(), new BodyStreamBuffer(getScriptState(), new FormDataBytesConsumer(content)), contentType, ResponseInit(), exceptionState);
     fetcher->setResponse(response);
 
     WebVector<WebServiceWorkerCache::BatchOperation> expectedPutOperations(size_t(1));
     {
         WebServiceWorkerCache::BatchOperation putOperation;
         putOperation.operationType = WebServiceWorkerCache::OperationTypePut;
         request->populateWebServiceWorkerRequest(putOperation.request);
         response->populateWebServiceWorkerResponse(putOperation.response);
         expectedPutOperations[0] = putOperation;
     }
     testCache->setExpectedBatchOperations(&expectedPutOperations);
 
     ScriptPromise addResult = cache->add(getScriptState(), requestToRequestInfo(request), exceptionState);
 
     EXPECT_EQ(kNotImplementedString, getRejectString(addResult));
     EXPECT_EQ(1, fetcher->fetchCount());
     EXPECT_EQ("dispatchBatch", testCache->getAndClearLastErrorWebCacheMethodCalled());
 }
 
 } // namespace
 
 } // namespace blink