Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/serviceworkers/ServiceWorker.h"
 
 #include <memory>
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/dom/MessagePort.h"
 #include "core/events/Event.h"
 #include "modules/EventTargetModules.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "public/platform/WebMessagePortChannel.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebString.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerState.h"
 
 namespace blink {
@@ skipping 10 matching lines @@
       ServiceWorkerContainerClient::From(GetExecutionContext());
   if (!client || !client->Provider()) {
     exception_state.ThrowDOMException(
         kInvalidStateError,
         "Failed to post a message: No associated provider is available.");
     return;
   }
 
   // Disentangle the port in preparation for sending it to the remote context.
   MessagePortChannelArray channels = MessagePort::DisentanglePorts(
-      ExecutionContext::From(script_state), ports, exception_state);
+      script_state->GetExecutionContext(), ports, exception_state);
   if (exception_state.HadException())
     return;
   if (handle_->ServiceWorker()->GetState() == kWebServiceWorkerStateRedundant) {
     exception_state.ThrowDOMException(kInvalidStateError,
                                       "ServiceWorker is in redundant state.");
     return;
   }
 
   WebString message_string = message->ToWireString();
   WebMessagePortChannelArray web_channels =
@@ skipping 80 matching lines @@
   handle_->ServiceWorker()->SetProxy(this);
 }
 
 ServiceWorker::~ServiceWorker() {}
 
 DEFINE_TRACE(ServiceWorker) {
   AbstractWorker::Trace(visitor);
 }
 
 }  // namespace blink