2 files changed, 11 insertions, 15 deletions
diff --git a/testing/js_embedder_test.cpp b/testing/js_embedder_test.cpp
index 1ca957b44f..9821a21166 100644
--- a/testing/js_embedder_test.cpp
+++ b/testing/js_embedder_test.cpp
@@ -15,15 +15,15 @@ JSEmbedderTest::~JSEmbedderTest() {}
 void JSEmbedderTest::SetUp() {
   v8::Isolate::CreateParams params;
   params.array_buffer_allocator = m_pArrayBufferAllocator.get();
-  m_pIsolate = v8::Isolate::New(params);
+  m_pIsolate.reset(v8::Isolate::New(params));
 
-  EmbedderTest::SetExternalIsolate(m_pIsolate);
+  EmbedderTest::SetExternalIsolate(isolate());
   EmbedderTest::SetUp();
 
-  v8::Isolate::Scope isolate_scope(m_pIsolate);
-  v8::HandleScope handle_scope(m_pIsolate);
-  FXJS_PerIsolateData::SetUp(m_pIsolate);
-  m_Engine = pdfium::MakeUnique<CFXJS_Engine>(m_pIsolate);
+  v8::Isolate::Scope isolate_scope(isolate());
+  v8::HandleScope handle_scope(isolate());
+  FXJS_PerIsolateData::SetUp(isolate());
+  m_Engine = pdfium::MakeUnique<CFXJS_Engine>(isolate());
   m_Engine->InitializeEngine();
 }
 
@@ -31,12 +31,7 @@ void JSEmbedderTest::TearDown() {
   m_Engine->ReleaseEngine();
   m_Engine.reset();
   EmbedderTest::TearDown();
-  m_pIsolate->Dispose();
-  m_pIsolate = nullptr;
-}
-
-v8::Isolate* JSEmbedderTest::isolate() {
-  return m_pIsolate;
+  m_pIsolate.reset();
 }
 
 v8::Local<v8::Context> JSEmbedderTest::GetV8Context() {
diff --git a/testing/js_embedder_test.h b/testing/js_embedder_test.h
index 44245e3024..089670e25b 100644
--- a/testing/js_embedder_test.h
+++ b/testing/js_embedder_test.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 
+#include "core/fxcrt/unowned_ptr.h"
 #include "fxjs/cfxjs_engine.h"
 #include "testing/embedder_test.h"
 
@@ -18,13 +19,13 @@ class JSEmbedderTest : public EmbedderTest {
   void SetUp() override;
   void TearDown() override;
 
-  v8::Isolate* isolate();
+  v8::Isolate* isolate() const { return m_pIsolate.get(); }
+  CFXJS_Engine* engine() const { return m_Engine.get(); }
   v8::Local<v8::Context> GetV8Context();
-  CFXJS_Engine* engine() { return m_Engine.get(); }
 
  private:
   std::unique_ptr<CFX_V8ArrayBufferAllocator> m_pArrayBufferAllocator;
-  v8::Isolate* m_pIsolate = nullptr;
+  std::unique_ptr<v8::Isolate, CFX_V8IsolateDeleter> m_pIsolate;
   std::unique_ptr<CFXJS_Engine> m_Engine;
 };