Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/cachestorage/CacheStorage.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/cachestorage/CacheStorage.h"
 
 #include <memory>
 #include <utility>
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/cachestorage/CacheStorageError.h"
 #include "modules/fetch/Request.h"
 #include "modules/fetch/Response.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerCacheError.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerCacheStorage.h"
 
 namespace blink {
 
 namespace {
 
 DOMException* CreateNoImplementationException() {
   return DOMException::Create(kNotSupportedError,
                               "No CacheStorage implementation provided.");
 }
 
 bool CommonChecks(ScriptState* script_state, ExceptionState& exception_state) {
-  ExecutionContext* execution_context = ExecutionContext::From(script_state);
+  ExecutionContext* execution_context = script_state->GetExecutionContext();
   // FIXME: May be null due to worker termination: http://crbug.com/413518.
   if (!execution_context)
     return false;
 
   String error_message;
   if (!execution_context->IsSecureContext(error_message)) {
     exception_state.ThrowSecurityError(error_message);
     return false;
   }
   return true;
@@ skipping 313 matching lines @@
 
 void CacheStorage::Dispose() {
   web_cache_storage_.reset();
 }
 
 DEFINE_TRACE(CacheStorage) {
   visitor->Trace(scoped_fetcher_);
 }
 
 }  // namespace blink