From 3851f4e7d811087cb941989b3bf46b7881f93c18 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Mon, 14 Sep 2020 14:08:46 -0700
Subject: [PATCH] fix: call node::Stop on exit (#25430)

---
 shell/app/node_main.cc                       | 2 +-
 shell/browser/electron_browser_main_parts.cc | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/shell/app/node_main.cc b/shell/app/node_main.cc
index 29480dc6ca302..70b146d6fdd08 100644
--- a/shell/app/node_main.cc
+++ b/shell/app/node_main.cc
@@ -284,7 +284,7 @@ int NodeMain(int argc, char* argv[]) {
 
     node::ResetStdio();
 
-    env->set_can_call_into_js(false);
+    node::Stop(env);
     env->stop_sub_worker_contexts();
     env->RunCleanup();
 
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index f70997008e15e..78a40a153c4bf 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -551,6 +551,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun() {
   node_debugger_->Stop();
   node_env_->env()->set_trace_sync_io(false);
   js_env_->OnMessageLoopDestroying();
+  node::Stop(node_env_->env());
   node_env_.reset();
 
   ElectronBrowserContext::browser_context_map().clear();