From 66925590bda99d2a69a4111c48af88f4caa3aa1f Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 12 Oct 2022 22:28:02 +0200
Subject: [PATCH] src: clean up embedder API

https://github.com/nodejs/node/pull/35897
---
 shell/browser/javascript_environment.cc | 4 ++--
 shell/browser/javascript_environment.h  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc
index 2acd06cbbafa1a..4978d1ff28e7ad 100644
--- a/shell/browser/javascript_environment.cc
+++ b/shell/browser/javascript_environment.cc
@@ -262,11 +262,11 @@ v8::Isolate* JavascriptEnvironment::Initialize(uv_loop_t* event_loop) {
   auto* tracing_agent = node::CreateAgent();
   auto* tracing_controller = new TracingControllerImpl();
   node::tracing::TraceEventHelper::SetAgent(tracing_agent);
-  platform_ = node::CreatePlatform(
+  platform_ = node::MultiIsolatePlatform::Create(
       base::RecommendedMaxNumberOfThreadsInThreadGroup(3, 8, 0.1, 0),
       tracing_controller, gin::V8Platform::PageAllocator());
 
-  v8::V8::InitializePlatform(platform_);
+  v8::V8::InitializePlatform(platform_.get());
   gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
                                  gin::ArrayBufferAllocator::SharedInstance(),
                                  nullptr /* external_reference_table */,
diff --git a/shell/browser/javascript_environment.h b/shell/browser/javascript_environment.h
index 31ca8544900dd4..ace6bdc93f30ea 100644
--- a/shell/browser/javascript_environment.h
+++ b/shell/browser/javascript_environment.h
@@ -32,7 +32,7 @@ class JavascriptEnvironment {
   void OnMessageLoopCreated();
   void OnMessageLoopDestroying();
 
-  node::MultiIsolatePlatform* platform() const { return platform_; }
+  node::MultiIsolatePlatform* platform() const { return platform_.get(); }
   v8::Isolate* isolate() const { return isolate_; }
   v8::Local<v8::Context> context() const {
     return v8::Local<v8::Context>::New(isolate_, context_);
@@ -42,8 +42,7 @@ class JavascriptEnvironment {
 
  private:
   v8::Isolate* Initialize(uv_loop_t* event_loop);
-  // Leaked on exit.
-  node::MultiIsolatePlatform* platform_;
+  std::unique_ptr<node::MultiIsolatePlatform> platform_;
 
   v8::Isolate* isolate_;
   gin::IsolateHolder isolate_holder_;