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

third_party/WebKit/Source/modules/fetch/FetchResponseData.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/FetchResponseData.h"
 
-#include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/fetch/CrossOriginAccessControl.h"
 #include "core/fetch/FetchUtils.h"
 #include "modules/fetch/BodyStreamBuffer.h"
 #include "modules/fetch/DataConsumerHandleUtil.h"
 #include "modules/fetch/DataConsumerTee.h"
 #include "modules/fetch/FetchHeaderList.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerResponse.h"
 
 namespace blink {
@@ skipping 136 matching lines @@
 }
 
 String FetchResponseData::internalMIMEType() const
 {
     if (m_internalResponse) {
         return m_internalResponse->mimeType();
     }
     return m_mimeType;
 }
 
-FetchResponseData* FetchResponseData::clone(ScriptState* scriptState)
+FetchResponseData* FetchResponseData::clone(ExecutionContext* executionContext)
 {
     FetchResponseData* newResponse = create();
     newResponse->m_type = m_type;
     if (m_terminationReason) {
         newResponse->m_terminationReason = adoptPtr(new TerminationReason);
         *newResponse->m_terminationReason = *m_terminationReason;
     }
     newResponse->m_url = m_url;
     newResponse->m_status = m_status;
     newResponse->m_statusMessage = m_statusMessage;
     newResponse->m_headerList = m_headerList->clone();
     newResponse->m_mimeType = m_mimeType;
     newResponse->m_responseTime = m_responseTime;
     newResponse->m_cacheStorageCacheName = m_cacheStorageCacheName;
 
     switch (m_type) {
     case BasicType:
     case CORSType:
         ASSERT(m_internalResponse);
         ASSERT(m_buffer == m_internalResponse->m_buffer);
         ASSERT(m_internalResponse->m_type == DefaultType);
-        newResponse->m_internalResponse = m_internalResponse->clone(scriptState);
+        newResponse->m_internalResponse = m_internalResponse->clone(executionContext);
         m_buffer = m_internalResponse->m_buffer;
         newResponse->m_buffer = newResponse->m_internalResponse->m_buffer;
         break;
     case DefaultType: {
         ASSERT(!m_internalResponse);
         if (m_buffer) {
             OwnPtr<WebDataConsumerHandle> handle1, handle2;
-            DataConsumerTee::create(scriptState->getExecutionContext(), m_buffer->releaseHandle(), &handle1, &handle2);
-            m_buffer = new BodyStreamBuffer(scriptState, createFetchDataConsumerHandleFromWebHandle(handle1.release()));
-            newResponse->m_buffer = new BodyStreamBuffer(scriptState, createFetchDataConsumerHandleFromWebHandle(handle2.release()));
+            DataConsumerTee::create(executionContext, m_buffer->releaseHandle(executionContext), &handle1, &handle2);
+            m_buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle1.release()));
+            newResponse->m_buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle2.release()));
         }
         break;
     }
     case ErrorType:
         ASSERT(!m_internalResponse);
         ASSERT(!m_buffer);
         break;
     case OpaqueType:
     case OpaqueRedirectType:
         ASSERT(m_internalResponse);
         ASSERT(!m_buffer);
         ASSERT(m_internalResponse->m_type == DefaultType);
-        newResponse->m_internalResponse = m_internalResponse->clone(scriptState);
+        newResponse->m_internalResponse = m_internalResponse->clone(executionContext);
         break;
     }
     return newResponse;
 }
 
 void FetchResponseData::populateWebServiceWorkerResponse(WebServiceWorkerResponse& response)
 {
     if (m_internalResponse) {
         m_internalResponse->populateWebServiceWorkerResponse(response);
         response.setResponseType(fetchTypeToWebType(m_type));
@@ skipping 34 matching lines @@
 }
 
 DEFINE_TRACE(FetchResponseData)
 {
     visitor->trace(m_headerList);
     visitor->trace(m_internalResponse);
     visitor->trace(m_buffer);
 }
 
 } // namespace blink