Revert of Make Response::body return v8-extra based stream behind flag

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

Index: third_party/WebKit/Source/modules/fetch/FetchRequestData.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/FetchRequestData.cpp b/third_party/WebKit/Source/modules/fetch/FetchRequestData.cpp
index bbf9da8f45ad68d3c7f3088e3ec024ee16b4a0c4..eb72cc11b08dee8be67d136f1b83c126bfc09712 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchRequestData.cpp
+++ b/third_party/WebKit/Source/modules/fetch/FetchRequestData.cpp
@@ -4,7 +4,6 @@
 
 #include "modules/fetch/FetchRequestData.h"
 
-#include "bindings/core/v8/ScriptState.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/loader/ThreadableLoader.h"
@@ -27,7 +26,7 @@
     return new FetchRequestData();
 }
 
-FetchRequestData* FetchRequestData::create(ScriptState* scriptState, const WebServiceWorkerRequest& webRequest)
+FetchRequestData* FetchRequestData::create(ExecutionContext* executionContext, const WebServiceWorkerRequest& webRequest)
 {
     FetchRequestData* request = FetchRequestData::create();
     request->m_url = webRequest.url();
@@ -35,7 +34,7 @@
     for (HTTPHeaderMap::const_iterator it = webRequest.headers().begin(); it != webRequest.headers().end(); ++it)
         request->m_headerList->append(it->key, it->value);
     if (webRequest.blobDataHandle())
-        request->setBuffer(new BodyStreamBuffer(scriptState, FetchBlobDataConsumerHandle::create(scriptState->getExecutionContext(), webRequest.blobDataHandle())));
+        request->setBuffer(new BodyStreamBuffer(FetchBlobDataConsumerHandle::create(executionContext, webRequest.blobDataHandle())));
     request->setContext(webRequest.requestContext());
     request->setReferrer(Referrer(webRequest.referrerUrl().string(), ReferrerPolicyDefault));
     request->setMode(webRequest.mode());
@@ -66,25 +65,25 @@
     return request;
 }
 
-FetchRequestData* FetchRequestData::clone(ScriptState* scriptState)
+FetchRequestData* FetchRequestData::clone(ExecutionContext* executionContext)
 {
     FetchRequestData* request = FetchRequestData::cloneExceptBody();
     if (m_buffer) {
         OwnPtr<FetchDataConsumerHandle> dest1, dest2;
-        DataConsumerTee::create(scriptState->getExecutionContext(), m_buffer->releaseHandle(), &dest1, &dest2);
-        m_buffer = new BodyStreamBuffer(scriptState, dest1.release());
-        request->m_buffer = new BodyStreamBuffer(scriptState, dest2.release());
+        DataConsumerTee::create(executionContext, m_buffer->releaseHandle(executionContext), &dest1, &dest2);
+        m_buffer = new BodyStreamBuffer(dest1.release());
+        request->m_buffer = new BodyStreamBuffer(dest2.release());
     }
     return request;
 }
 
-FetchRequestData* FetchRequestData::pass(ScriptState* scriptState)
+FetchRequestData* FetchRequestData::pass(ExecutionContext* executionContext)
 {
     FetchRequestData* request = FetchRequestData::cloneExceptBody();
     if (m_buffer) {
         request->m_buffer = m_buffer;
-        m_buffer = new BodyStreamBuffer(scriptState, createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle()));
-        m_buffer->setDisturbed();
+        m_buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle()));
+        m_buffer->stream()->setIsDisturbed();
     }
     return request;
 }