Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/cachestorage/CacheTest.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/Cache.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/modules/v8/V8Request.h"
 #include "bindings/modules/v8/V8Response.h"
 #include "core/dom/Document.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/frame/Frame.h"
 #include "core/testing/DummyPageHolder.h"
 #include "modules/fetch/BodyStreamBuffer.h"
 #include "modules/fetch/FormDataBytesConsumer.h"
 #include "modules/fetch/GlobalFetch.h"
 #include "modules/fetch/Request.h"
 #include "modules/fetch/Response.h"
 #include "modules/fetch/ResponseInit.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/WebURLResponse.h"
@@ skipping 208 matching lines @@
 
   Cache* CreateCache(ScopedFetcherForTests* fetcher,
                      WebServiceWorkerCache* web_cache) {
     return Cache::Create(fetcher, WTF::WrapUnique(web_cache));
   }
 
   ScriptState* GetScriptState() {
     return ToScriptStateForMainWorld(page_->GetDocument().GetFrame());
   }
   ExecutionContext* GetExecutionContext() {
-    return ExecutionContext::From(GetScriptState());
+    return GetScriptState()->GetExecutionContext();
   }
   v8::Isolate* GetIsolate() { return GetScriptState()->GetIsolate(); }
   v8::Local<v8::Context> GetContext() { return GetScriptState()->GetContext(); }
 
   Request* NewRequestFromUrl(const String& url) {
     DummyExceptionStateForTesting exception_state;
     Request* request = Request::Create(GetScriptState(), url, exception_state);
     EXPECT_FALSE(exception_state.HadException());
     return exception_state.HadException() ? 0 : request;
   }
@@ skipping 474 matching lines @@
 
   EXPECT_EQ(kNotImplementedString, GetRejectString(add_result));
   EXPECT_EQ(1, fetcher->FetchCount());
   EXPECT_EQ("dispatchBatch",
             test_cache->GetAndClearLastErrorWebCacheMethodCalled());
 }
 
 }  // namespace
 
 }  // namespace blink