Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.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/serviceworkers/NavigatorServiceWorker.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/Document.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "modules/serviceworkers/ServiceWorkerContainer.h"
 
 namespace blink {
 
 NavigatorServiceWorker::NavigatorServiceWorker(Navigator& navigator) {}
 
 NavigatorServiceWorker* NavigatorServiceWorker::From(Document& document) {
@@ skipping 28 matching lines @@
 }
 
 const char* NavigatorServiceWorker::SupplementName() {
   return "NavigatorServiceWorker";
 }
 
 ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(
     ScriptState* script_state,
     Navigator& navigator,
     ExceptionState& exception_state) {
-  ExecutionContext* execution_context = ExecutionContext::From(script_state);
+  ExecutionContext* execution_context = script_state->GetExecutionContext();
   DCHECK(!navigator.GetFrame() ||
          execution_context->GetSecurityOrigin()->CanAccess(
              navigator.GetFrame()->GetSecurityContext()->GetSecurityOrigin()));
   return NavigatorServiceWorker::From(navigator).serviceWorker(
       navigator.GetFrame(), exception_state);
 }
 
 ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(
     ScriptState* script_state,
     Navigator& navigator,
     String& error_message) {
-  ExecutionContext* execution_context = ExecutionContext::From(script_state);
+  ExecutionContext* execution_context = script_state->GetExecutionContext();
   DCHECK(!navigator.GetFrame() ||
          execution_context->GetSecurityOrigin()->CanAccess(
              navigator.GetFrame()->GetSecurityContext()->GetSecurityOrigin()));
   return NavigatorServiceWorker::From(navigator).serviceWorker(
       navigator.GetFrame(), error_message);
 }
 
 ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(
     LocalFrame* frame,
     ExceptionState& exception_state) {
@@ skipping 41 matching lines @@
 void NavigatorServiceWorker::ClearServiceWorker() {
   service_worker_ = nullptr;
 }
 
 DEFINE_TRACE(NavigatorServiceWorker) {
   visitor->Trace(service_worker_);
   Supplement<Navigator>::Trace(visitor);
 }
 
 }  // namespace blink