From 7fc5c468e91c6266e7cd66635fa749fbfdcbe192 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 15 Sep 2020 10:25:40 -0600
Subject: [PATCH] fix: call node::Stop on exit (#25458)

* fix: call node::Stop on exit

* also call Stop in node_main

* oop, we were already calling set_can_call_into_js(false)??

Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
---
 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 83d9bbec11cbe..69444b5c7ca6a 100644
--- a/shell/app/node_main.cc
+++ b/shell/app/node_main.cc
@@ -289,7 +289,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 635d3c0701331..3715a8a9b3836 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();