Index: third_party/WebKit/LayoutTests/resources/mojo-helpers.js |
diff --git a/third_party/WebKit/LayoutTests/resources/mojo-helpers.js b/third_party/WebKit/LayoutTests/resources/mojo-helpers.js |
index db7a6264bf3d0f6219356e6ff2a3b89c06e6518f..a41b80b935099faa759eac4101d3ebde16c9a7c7 100644 |
--- a/third_party/WebKit/LayoutTests/resources/mojo-helpers.js |
+++ b/third_party/WebKit/LayoutTests/resources/mojo-helpers.js |
@@ -34,10 +34,13 @@ define('Mojo Helpers', [ |
'content/public/renderer/frame_service_registry', |
'content/public/renderer/service_registry', |
], (core, router, support, frameServiceRegistry, serviceRegistry) => { |
- add_completion_callback(() => { |
+ let tearDown = () => { |
frameServiceRegistry.clearServiceOverridesForTesting(); |
serviceRegistry.clearServiceOverridesForTesting(); |
- }); |
+ }; |
+ addEventListener('unload', tearDown); |
+ if (window.add_completion_callback) |
+ add_completion_callback(tearDown); |
return { |
core, |