From 489aafc1f9d1a6fa15393af0a1495de96f280254 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 16 Sep 2020 17:39:35 -0700
Subject: [PATCH] fix: call node::Stop on exit (#25502)

---
 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 9d16e59a5956f..43fbfaac63bff 100644
--- a/shell/app/node_main.cc
+++ b/shell/app/node_main.cc
@@ -233,7 +233,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 06f30ebc0bb83..40fd8acf5e1c9 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -552,6 +552,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun() {
   // invoke Node/V8 APIs inside them.
   node_debugger_->Stop();
   node_env_->env()->set_trace_sync_io(false);
+  node::Stop(node_env_->env());
   node_env_.reset();
   js_env_->OnMessageLoopDestroying();