Remove create[Done|UnexpectedError]DataConsumerHandle

third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.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/BodyStreamBuffer.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8HiddenValue.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMTypedArray.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/streams/ReadableStreamController.h"
 #include "core/streams/ReadableStreamOperations.h"
 #include "modules/fetch/Body.h"
-#include "modules/fetch/BytesConsumerForDataConsumerHandle.h"
-#include "modules/fetch/DataConsumerHandleUtil.h"
 #include "modules/fetch/ReadableStreamBytesConsumer.h"
 #include "platform/blob/BlobData.h"
 #include "platform/network/EncodedFormData.h"
 #include <memory>
 
 namespace blink {
 
 class BodyStreamBuffer::LoaderClient final
     : public GarbageCollectedFinalized<LoaderClient>,
       public ActiveDOMObject,
@@ skipping 42 matching lines @@
     FetchDataLoader::Client::trace(visitor);
   }
 
  private:
   void stop() override { m_buffer->stopLoading(); }
 
   Member<BodyStreamBuffer> m_buffer;
   Member<FetchDataLoader::Client> m_client;
 };
 
-BodyStreamBuffer::BodyStreamBuffer(
-    ScriptState* scriptState,
-    std::unique_ptr<FetchDataConsumerHandle> handle)
-    : BodyStreamBuffer(scriptState,
-                       new BytesConsumerForDataConsumerHandle(
-                           scriptState->getExecutionContext(),
-                           std::move(handle))) {}
-
 BodyStreamBuffer::BodyStreamBuffer(ScriptState* scriptState,
                                    BytesConsumer* consumer)
     : UnderlyingSourceBase(scriptState),
       m_scriptState(scriptState),
       m_consumer(consumer),
       m_madeFromReadableStream(false) {
   v8::Local<v8::Value> bodyValue = toV8(this, scriptState);
   DCHECK(!bodyValue.IsEmpty());
   DCHECK(bodyValue->IsObject());
   v8::Local<v8::Object> body = bodyValue.As<v8::Object>();
 
   ScriptValue readableStream = ReadableStreamOperations::createReadableStream(
       scriptState, this,
       ReadableStreamOperations::createCountQueuingStrategy(scriptState, 0));
   DCHECK(!readableStream.isEmpty());
   V8HiddenValue::setHiddenValue(
       scriptState, body,
       V8HiddenValue::internalBodyStream(scriptState->isolate()),
       readableStream.v8Value());
   m_consumer->setClient(this);
+  onStateChange();
 }
 
 BodyStreamBuffer::BodyStreamBuffer(ScriptState* scriptState, ScriptValue stream)
     : UnderlyingSourceBase(scriptState),
       m_scriptState(scriptState),
       m_madeFromReadableStream(true) {
   DCHECK(ReadableStreamOperations::isReadableStream(scriptState, stream));
   v8::Local<v8::Value> bodyValue = toV8(this, scriptState);
   DCHECK(!bodyValue.IsEmpty());
   DCHECK(bodyValue->IsObject());
@@ skipping 260 matching lines @@
   // We need to call these before calling closeAndLockAndDisturb.
   const bool isClosed = isStreamClosed();
   const bool isErrored = isStreamErrored();
   BytesConsumer* consumer = m_consumer.release();
 
   closeAndLockAndDisturb();
 
   if (isClosed) {
     // Note that the stream cannot be "draining", because it doesn't have
     // the internal buffer.
-    return new BytesConsumerForDataConsumerHandle(
-        m_scriptState->getExecutionContext(),
-        createFetchDataConsumerHandleFromWebHandle(
-            createDoneDataConsumerHandle()));
+    return BytesConsumer::createClosed();
   }
   if (isErrored)
-    return new BytesConsumerForDataConsumerHandle(
-        m_scriptState->getExecutionContext(),
-        createFetchDataConsumerHandleFromWebHandle(
-            createUnexpectedErrorDataConsumerHandle()));
+    return BytesConsumer::createErrored(BytesConsumer::Error("error"));
 
   DCHECK(consumer);
   consumer->clearClient();
   return consumer;
 }
 
 }  // namespace blink