Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/nfc/NFC.cpp

 // Copyright 2015 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/nfc/NFC.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/V8ArrayBuffer.h"
 #include "bindings/core/v8/V8StringResource.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "modules/nfc/NFCError.h"
 #include "modules/nfc/NFCMessage.h"
 #include "modules/nfc/NFCPushOptions.h"
 #include "modules/nfc/NFCWatchOptions.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 
 namespace {
@@ skipping 593 matching lines @@
   if (exception)
     return ScriptPromise::RejectWithDOMException(script_state, exception);
 
   device::nfc::mojom::blink::NFCMessagePtr message =
       device::nfc::mojom::blink::NFCMessage::From(push_message);
   if (!message)
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kSyntaxError));
 
   if (!SetURL(
-          ExecutionContext::From(script_state)->GetSecurityOrigin()->ToString(),
+          script_state->GetExecutionContext()->GetSecurityOrigin()->ToString(),
           message))
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kSyntaxError));
 
   if (GetNFCMessageSize(message) >
       device::nfc::mojom::blink::NFCMessage::kMaxSize) {
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kNotSupportedError));
   }
 
@@ skipping 130 matching lines @@
       DCHECK(script_state);
       ScriptState::Scope scope(script_state);
       NFCMessage nfc_message = ToNFCMessage(script_state, message);
       callback->handleMessage(nfc_message);
     }
   }
 }
 
 ScriptPromise NFC::RejectIfNotSupported(ScriptState* script_state) {
   String error_message;
-  ExecutionContext* context = ExecutionContext::From(script_state);
+  ExecutionContext* context = script_state->GetExecutionContext();
   if (!context->IsSecureContext(error_message)) {
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kSecurityError, error_message));
   }
 
   // https://w3c.github.io/web-nfc/#security-policies
   // WebNFC API must be only accessible from top level browsing context.
   if (!ToDocument(context)->domWindow()->GetFrame() ||
       !ToDocument(context)->GetFrame()->IsMainFrame()) {
     return ScriptPromise::RejectWithDOMException(
@@ skipping 35 matching lines @@
 }
 
 DEFINE_TRACE(NFC) {
   PageVisibilityObserver::Trace(visitor);
   ContextLifecycleObserver::Trace(visitor);
   visitor->Trace(requests_);
   visitor->Trace(callbacks_);
 }
 
 }  // namespace blink