Revert of Move ScriptState::GetExecutionContext (Part 5)

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 <memory>
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8PrivateProperty.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMTypedArray.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/streams/ReadableStreamController.h"
 #include "core/streams/ReadableStreamOperations.h"
 #include "modules/fetch/Body.h"
 #include "modules/fetch/ReadableStreamBytesConsumer.h"
 #include "platform/blob/BlobData.h"
 #include "platform/network/EncodedFormData.h"
 
 namespace blink {
 
 class BodyStreamBuffer::LoaderClient final
@@ skipping 138 matching lines @@
     return form_data.Release();
   }
   return nullptr;
 }
 
 void BodyStreamBuffer::StartLoading(FetchDataLoader* loader,
                                     FetchDataLoader::Client* client) {
   ASSERT(!loader_);
   ASSERT(script_state_->ContextIsValid());
   loader_ = loader;
-  loader->Start(ReleaseHandle(),
-                new LoaderClient(ExecutionContext::From(script_state_.Get()),
-                                 this, client));
+  loader->Start(
+      ReleaseHandle(),
+      new LoaderClient(script_state_->GetExecutionContext(), this, client));
 }
 
 void BodyStreamBuffer::Tee(BodyStreamBuffer** branch1,
                            BodyStreamBuffer** branch2) {
   DCHECK(!IsStreamLocked());
   DCHECK(!IsStreamDisturbed());
   *branch1 = nullptr;
   *branch2 = nullptr;
 
   if (made_from_readable_stream_) {
     ScriptValue stream1, stream2;
     ReadableStreamOperations::Tee(script_state_.Get(), Stream(), &stream1,
                                   &stream2);
     *branch1 = new BodyStreamBuffer(script_state_.Get(), stream1);
     *branch2 = new BodyStreamBuffer(script_state_.Get(), stream2);
     return;
   }
   BytesConsumer* dest1 = nullptr;
   BytesConsumer* dest2 = nullptr;
-  BytesConsumer::Tee(ExecutionContext::From(script_state_.Get()),
-                     ReleaseHandle(), &dest1, &dest2);
+  BytesConsumer::Tee(script_state_->GetExecutionContext(), ReleaseHandle(),
+                     &dest1, &dest2);
   *branch1 = new BodyStreamBuffer(script_state_.Get(), dest1);
   *branch2 = new BodyStreamBuffer(script_state_.Get(), dest2);
 }
 
 ScriptPromise BodyStreamBuffer::pull(ScriptState* script_state) {
   ASSERT(script_state == script_state_.Get());
   if (stream_needs_more_)
     return ScriptPromise::CastUndefined(script_state);
   stream_needs_more_ = true;
   ProcessData();
@@ skipping 181 matching lines @@
   }
   if (is_errored)
     return BytesConsumer::CreateErrored(BytesConsumer::Error("error"));
 
   DCHECK(consumer);
   consumer->ClearClient();
   return consumer;
 }
 
 }  // namespace blink