Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/permissions/Permissions.cpp

Index: third_party/WebKit/Source/modules/permissions/Permissions.cpp
diff --git a/third_party/WebKit/Source/modules/permissions/Permissions.cpp b/third_party/WebKit/Source/modules/permissions/Permissions.cpp
index f9a49940254a69240cbb17a52e311b23c9a8f6cb..33e84e59abe81e87cd9880aabefa3ba13bb8356f 100644
--- a/third_party/WebKit/Source/modules/permissions/Permissions.cpp
+++ b/third_party/WebKit/Source/modules/permissions/Permissions.cpp
@@ -15,7 +15,6 @@
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalFrame.h"
 #include "modules/permissions/PermissionDescriptor.h"
 #include "modules/permissions/PermissionStatus.h"
@@ -109,7 +108,7 @@ ScriptPromise Permissions::query(ScriptState* script_state,
 
   // This must be called after `parsePermission` because the website might
   // be able to run code.
-  PermissionService* service = GetService(ExecutionContext::From(script_state));
+  PermissionService* service = GetService(script_state->GetExecutionContext());
   if (!service)
     return ScriptPromise::RejectWithDOMException(
         script_state,
@@ -127,7 +126,7 @@ ScriptPromise Permissions::query(ScriptState* script_state,
   PermissionDescriptorPtr descriptor_copy = descriptor->Clone();
   service->HasPermission(
       std::move(descriptor),
-      ExecutionContext::From(script_state)->GetSecurityOrigin(),
+      script_state->GetExecutionContext()->GetSecurityOrigin(),
       ConvertToBaseCallback(WTF::Bind(
           &Permissions::TaskComplete, WrapPersistent(this),
           WrapPersistent(resolver), WTF::Passed(std::move(descriptor_copy)))));
@@ -146,7 +145,7 @@ ScriptPromise Permissions::request(ScriptState* script_state,
 
   // This must be called after `parsePermission` because the website might
   // be able to run code.
-  PermissionService* service = GetService(ExecutionContext::From(script_state));
+  PermissionService* service = GetService(script_state->GetExecutionContext());
   if (!service)
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kInvalidStateError,
@@ -159,7 +158,7 @@ ScriptPromise Permissions::request(ScriptState* script_state,
   PermissionDescriptorPtr descriptor_copy = descriptor->Clone();
   service->RequestPermission(
       std::move(descriptor),
-      ExecutionContext::From(script_state)->GetSecurityOrigin(),
+      script_state->GetExecutionContext()->GetSecurityOrigin(),
       UserGestureIndicator::ProcessingUserGestureThreadSafe(),
       ConvertToBaseCallback(WTF::Bind(
           &Permissions::TaskComplete, WrapPersistent(this),
@@ -179,7 +178,7 @@ ScriptPromise Permissions::revoke(ScriptState* script_state,
 
   // This must be called after `parsePermission` because the website might
   // be able to run code.
-  PermissionService* service = GetService(ExecutionContext::From(script_state));
+  PermissionService* service = GetService(script_state->GetExecutionContext());
   if (!service)
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kInvalidStateError,
@@ -192,7 +191,7 @@ ScriptPromise Permissions::revoke(ScriptState* script_state,
   PermissionDescriptorPtr descriptor_copy = descriptor->Clone();
   service->RevokePermission(
       std::move(descriptor),
-      ExecutionContext::From(script_state)->GetSecurityOrigin(),
+      script_state->GetExecutionContext()->GetSecurityOrigin(),
       ConvertToBaseCallback(WTF::Bind(
           &Permissions::TaskComplete, WrapPersistent(this),
           WrapPersistent(resolver), WTF::Passed(std::move(descriptor_copy)))));
@@ -233,7 +232,7 @@ ScriptPromise Permissions::requestAll(
 
   // This must be called after `parsePermission` because the website might
   // be able to run code.
-  PermissionService* service = GetService(ExecutionContext::From(script_state));
+  PermissionService* service = GetService(script_state->GetExecutionContext());
   if (!service)
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kInvalidStateError,
@@ -250,7 +249,7 @@ ScriptPromise Permissions::requestAll(
 
   service->RequestPermissions(
       std::move(internal_permissions),
-      ExecutionContext::From(script_state)->GetSecurityOrigin(),
+      script_state->GetExecutionContext()->GetSecurityOrigin(),
       UserGestureIndicator::ProcessingUserGestureThreadSafe(),
       ConvertToBaseCallback(
           WTF::Bind(&Permissions::BatchTaskComplete, WrapPersistent(this),