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

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

Index: third_party/WebKit/Source/modules/fetch/Request.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/Request.cpp b/third_party/WebKit/Source/modules/fetch/Request.cpp
index 270e03b153b4fb081acf7c37ecea349db4a29168..54ddc5f9c1b5540c19eafb54c963f94dc017bedd 100644
--- a/third_party/WebKit/Source/modules/fetch/Request.cpp
+++ b/third_party/WebKit/Source/modules/fetch/Request.cpp
@@ -268,7 +268,7 @@
     }
     // "Let |r| be a new Request object associated with |request| and a new
     // Headers object whose guard is "request"."
-    Request* r = Request::create(scriptState, request);
+    Request* r = Request::create(scriptState->getExecutionContext(), request);
     // Perform the following steps:
     // - "Let |headers| be a copy of |r|'s Headers object."
     // - "If |init|'s headers member is present, set |headers| to |init|'s
@@ -343,7 +343,7 @@
         //   contains no header named `Content-Type`, append
         //   `Content-Type`/|Content-Type| to |r|'s Headers object. Rethrow any
         //   exception."
-        temporaryBody = new BodyStreamBuffer(scriptState, init.body.release());
+        temporaryBody = new BodyStreamBuffer(init.body.release());
         if (!init.contentType.isEmpty() && !r->getHeaders()->has(HTTPNames::Content_Type, exceptionState)) {
             r->getHeaders()->append(HTTPNames::Content_Type, init.contentType, exceptionState);
         }
@@ -363,9 +363,9 @@
     // non-null, run these substeps:"
     if (inputRequest && inputRequest->bodyBuffer()) {
         // "Set |input|'s body to an empty byte stream."
-        inputRequest->m_request->setBuffer(new BodyStreamBuffer(scriptState, createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle())));
+        inputRequest->m_request->setBuffer(new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle())));
         // "Set |input|'s disturbed flag."
-        inputRequest->bodyBuffer()->setDisturbed();
+        inputRequest->bodyBuffer()->stream()->setIsDisturbed();
     }
 
     // "Return |r|."
@@ -402,32 +402,33 @@
     return createRequestWithRequestOrString(scriptState, input, String(), requestInit, exceptionState);
 }
 
-Request* Request::create(ScriptState* scriptState, FetchRequestData* request)
-{
-    return new Request(scriptState, request);
-}
-
-Request* Request::create(ScriptState* scriptState, const WebServiceWorkerRequest& webRequest)
-{
-    return new Request(scriptState, webRequest);
-}
-
-Request::Request(ScriptState* scriptState, FetchRequestData* request, Headers* headers)
-    : Body(scriptState->getExecutionContext())
+Request* Request::create(ExecutionContext* context, FetchRequestData* request)
+{
+    return new Request(context, request);
+}
+
+Request::Request(ExecutionContext* context, FetchRequestData* request)
+    : Body(context)
     , m_request(request)
-    , m_headers(headers)
-{
-}
-
-Request::Request(ScriptState* scriptState, FetchRequestData* request)
-    : Request(scriptState, request, Headers::create(request->headerList()))
+    , m_headers(Headers::create(m_request->headerList()))
 {
     m_headers->setGuard(Headers::RequestGuard);
 }
 
-Request::Request(ScriptState* scriptState, const WebServiceWorkerRequest& request)
-    : Request(scriptState, FetchRequestData::create(scriptState, request))
-{
+Request::Request(ExecutionContext* context, FetchRequestData* request, Headers* headers)
+    : Body(context) , m_request(request) , m_headers(headers) {}
+
+Request* Request::create(ExecutionContext* context, const WebServiceWorkerRequest& webRequest)
+{
+    return new Request(context, webRequest);
+}
+
+Request::Request(ExecutionContext* context, const WebServiceWorkerRequest& webRequest)
+    : Body(context)
+    , m_request(FetchRequestData::create(context, webRequest))
+    , m_headers(Headers::create(m_request->headerList()))
+{
+    m_headers->setGuard(Headers::RequestGuard);
 }
 
 String Request::method() const
@@ -591,23 +592,23 @@
     return m_request->integrity();
 }
 
-Request* Request::clone(ScriptState* scriptState, ExceptionState& exceptionState)
+Request* Request::clone(ExceptionState& exceptionState)
 {
     if (isBodyLocked() || bodyUsed()) {
         exceptionState.throwTypeError("Request body is already used");
         return nullptr;
     }
 
-    FetchRequestData* request = m_request->clone(scriptState);
+    FetchRequestData* request = m_request->clone(getExecutionContext());
     Headers* headers = Headers::create(request->headerList());
     headers->setGuard(m_headers->getGuard());
-    return new Request(scriptState, request, headers);
-}
-
-FetchRequestData* Request::passRequestData(ScriptState* scriptState)
+    return new Request(getExecutionContext(), request, headers);
+}
+
+FetchRequestData* Request::passRequestData()
 {
     ASSERT(!bodyUsed());
-    return m_request->pass(scriptState);
+    return m_request->pass(getExecutionContext());
 }
 
 bool Request::hasBody() const