Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/quota/StorageManager.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/quota/StorageManager.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/modules/v8/V8StorageEstimate.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "modules/permissions/PermissionUtils.h"
 #include "modules/quota/StorageEstimate.h"
 #include "platform/StorageQuotaCallbacks.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/wtf/Functional.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 using mojom::blink::PermissionName;
@@ skipping 34 matching lines @@
 
  private:
   Member<ScriptPromiseResolver> resolver_;
 };
 
 }  // namespace
 
 ScriptPromise StorageManager::persist(ScriptState* script_state) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
-  ExecutionContext* execution_context = ExecutionContext::From(script_state);
+  ExecutionContext* execution_context = script_state->GetExecutionContext();
   DCHECK(execution_context->IsSecureContext());  // [SecureContext] in IDL
   SecurityOrigin* security_origin = execution_context->GetSecurityOrigin();
   if (security_origin->IsUnique()) {
     resolver->Reject(V8ThrowException::CreateTypeError(
         script_state->GetIsolate(), kUniqueOriginErrorMessage));
     return promise;
   }
 
   DCHECK(execution_context->IsDocument());
   PermissionService* permission_service =
-      GetPermissionService(ExecutionContext::From(script_state));
+      GetPermissionService(script_state->GetExecutionContext());
   if (!permission_service) {
     resolver->Reject(DOMException::Create(
         kInvalidStateError,
         "In its current state, the global scope can't request permissions."));
     return promise;
   }
   permission_service->RequestPermission(
       CreatePermissionDescriptor(PermissionName::DURABLE_STORAGE),
-      ExecutionContext::From(script_state)->GetSecurityOrigin(),
+      script_state->GetExecutionContext()->GetSecurityOrigin(),
       UserGestureIndicator::ProcessingUserGesture(),
       ConvertToBaseCallback(
           WTF::Bind(&StorageManager::PermissionRequestComplete,
                     WrapPersistent(this), WrapPersistent(resolver))));
 
   return promise;
 }
 
 ScriptPromise StorageManager::persisted(ScriptState* script_state) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
-  ExecutionContext* execution_context = ExecutionContext::From(script_state);
+  ExecutionContext* execution_context = script_state->GetExecutionContext();
   DCHECK(execution_context->IsSecureContext());  // [SecureContext] in IDL
   SecurityOrigin* security_origin = execution_context->GetSecurityOrigin();
   if (security_origin->IsUnique()) {
     resolver->Reject(V8ThrowException::CreateTypeError(
         script_state->GetIsolate(), kUniqueOriginErrorMessage));
     return promise;
   }
 
   PermissionService* permission_service =
-      GetPermissionService(ExecutionContext::From(script_state));
+      GetPermissionService(script_state->GetExecutionContext());
   if (!permission_service) {
     resolver->Reject(DOMException::Create(
         kInvalidStateError,
         "In its current state, the global scope can't query permissions."));
     return promise;
   }
   permission_service->HasPermission(
       CreatePermissionDescriptor(PermissionName::DURABLE_STORAGE),
-      ExecutionContext::From(script_state)->GetSecurityOrigin(),
+      script_state->GetExecutionContext()->GetSecurityOrigin(),
       ConvertToBaseCallback(
           WTF::Bind(&StorageManager::PermissionRequestComplete,
                     WrapPersistent(this), WrapPersistent(resolver))));
   return promise;
 }
 
 ScriptPromise StorageManager::estimate(ScriptState* script_state) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
-  ExecutionContext* execution_context = ExecutionContext::From(script_state);
+  ExecutionContext* execution_context = script_state->GetExecutionContext();
   DCHECK(execution_context->IsSecureContext());  // [SecureContext] in IDL
   SecurityOrigin* security_origin = execution_context->GetSecurityOrigin();
   if (security_origin->IsUnique()) {
     resolver->Reject(V8ThrowException::CreateTypeError(
         script_state->GetIsolate(), kUniqueOriginErrorMessage));
     return promise;
   }
 
   KURL storage_partition = KURL(KURL(), security_origin->ToString());
   Platform::Current()->QueryStorageUsageAndQuota(
@@ skipping 21 matching lines @@
 
 void StorageManager::PermissionRequestComplete(ScriptPromiseResolver* resolver,
                                                PermissionStatus status) {
   if (!resolver->GetExecutionContext() ||
       resolver->GetExecutionContext()->IsContextDestroyed())
     return;
   resolver->Resolve(status == PermissionStatus::GRANTED);
 }
 
 }  // namespace blink