diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 5aacbd8e6cebc..f7b28c6379b4c 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -2139,7 +2139,6 @@ crbug.com/626703 external/wpt/streams/writable-streams/close.dedicatedworker.htm
crbug.com/626703 external/wpt/streams/writable-streams/close.html [ Timeout ]
crbug.com/626703 external/wpt/streams/writable-streams/close.serviceworker.https.html [ Timeout ]
crbug.com/626703 external/wpt/service-workers/service-worker/registration-useCache.https.html [ Timeout ]
-crbug.com/626703 external/wpt/service-workers/service-worker/multi-globals/url-parsing.https.html [ Pass Failure ]
crbug.com/626703 external/wpt/streams/writable-streams/close.sharedworker.html [ Timeout ]
crbug.com/626703 external/wpt/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html [ Timeout ]
crbug.com/626703 external/wpt/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html [ Timeout ]
diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-load.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-load.https-expected.txt
deleted file mode 100644
index bfdba03d5d087..0000000000000
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-load.https-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL controller is set for a controlled document Cannot read property 'active' of undefined
-Harness: the test ran to completion.
-
diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https-expected.txt
deleted file mode 100644
index 752f699512e53..0000000000000
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL controller is set upon reload after registration promise_test: Unhandled rejection with value: object "TypeError: Cannot read property 'active' of undefined"
-Harness: the test ran to completion.
-
diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https.html
index 4490c707963bd..e0beb7260be11 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https.html
@@ -6,7 +6,8 @@
diff --git a/third_party/WebKit/LayoutTests/http/tests/background_sync/oneshot.html b/third_party/WebKit/LayoutTests/http/tests/background_sync/oneshot.html
index 24ae30ed7b343..6e416711c5e83 100644
--- a/third_party/WebKit/LayoutTests/http/tests/background_sync/oneshot.html
+++ b/third_party/WebKit/LayoutTests/http/tests/background_sync/oneshot.html
@@ -9,10 +9,10 @@
-
-
-
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
index 11fa5cecf80c6..d255aa5e75313 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
@@ -770,18 +770,6 @@ ExecutionContext* currentExecutionContext(v8::Isolate* isolate) {
return toExecutionContext(isolate->GetCurrentContext());
}
-ExecutionContext* enteredExecutionContext(v8::Isolate* isolate) {
- ExecutionContext* context = toExecutionContext(isolate->GetEnteredContext());
- if (!context) {
- // We don't always have an entered execution context, for example during
- // microtask callbacks from V8 (where the entered context may be the
- // DOM-in-JS context). In that case, we fall back to the current context.
- context = currentExecutionContext(isolate);
- ASSERT(context);
- }
- return context;
-}
-
Frame* toFrameIfNotDetached(v8::Local context) {
DOMWindow* window = toDOMWindow(context);
if (window && window->isCurrentlyDisplayedInFrame())
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8Binding.h b/third_party/WebKit/Source/bindings/core/v8/V8Binding.h
index 37f5a54d7f16c..0f3451394c33d 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8Binding.h
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Binding.h
@@ -976,7 +976,6 @@ CORE_EXPORT ExecutionContext* toExecutionContext(v8::Local);
CORE_EXPORT void registerToExecutionContextForModules(
ExecutionContext* (*toExecutionContextForModules)(v8::Local));
CORE_EXPORT ExecutionContext* currentExecutionContext(v8::Isolate*);
-CORE_EXPORT ExecutionContext* enteredExecutionContext(v8::Isolate*);
// Returns a V8 context associated with a ExecutionContext and a
// DOMWrapperWorld. This method returns an empty context if there is no frame
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
index fb3272ca97c56..396af9c0d01cf 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
@@ -282,16 +282,14 @@ ScriptPromise ServiceWorkerContainer::registerServiceWorker(
if (!executionContext)
return ScriptPromise();
- KURL scriptURL =
- enteredExecutionContext(scriptState->isolate())->completeURL(url);
+ KURL scriptURL = executionContext->completeURL(url);
scriptURL.removeFragmentIdentifier();
KURL patternURL;
if (options.scope().isNull())
patternURL = KURL(scriptURL, "./");
else
- patternURL = enteredExecutionContext(scriptState->isolate())
- ->completeURL(options.scope());
+ patternURL = executionContext->completeURL(options.scope());
registerServiceWorkerImpl(
executionContext, scriptURL, patternURL,
@@ -339,8 +337,7 @@ ScriptPromise ServiceWorkerContainer::getRegistration(
return promise;
}
- KURL completedURL =
- enteredExecutionContext(scriptState->isolate())->completeURL(documentURL);
+ KURL completedURL = executionContext->completeURL(documentURL);
completedURL.removeFragmentIdentifier();
if (!documentOrigin->canRequest(completedURL)) {
RefPtr documentURLOrigin =