Rename CFX_V8 to CFX_IsolateWrapper Longtstanding irritant. The name CFX_V8 doesn't carry any information. TAG=agy Bypass-Check-License: rename. Change-Id: Ia02662b0525d7d9a7fcc8e1a263a8a63f1abd3e2 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/148191 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>

diff --git a/fxjs/BUILD.gn b/fxjs/BUILD.gn
index ccddf8d..8062138 100644
--- a/fxjs/BUILD.gn
+++ b/fxjs/BUILD.gn

@@ -24,10 +24,10 @@
     sources += [
       "cfx_globaldata.cpp",
       "cfx_globaldata.h",
+      "cfx_isolate_wrapper.cpp",
+      "cfx_isolate_wrapper.h",
       "cfx_keyvalue.cpp",
       "cfx_keyvalue.h",
-      "cfx_v8.cpp",
-      "cfx_v8.h",
       "cfx_v8_array_buffer_allocator.cpp",
       "cfx_v8_array_buffer_allocator.h",
       "cfxjs_engine.cpp",
@@ -242,7 +242,7 @@
   pdfium_unittest_source_set("unittests") {
     sources = [
       "cfx_globaldata_unittest.cpp",
-      "cfx_v8_unittest.cpp",
+      "cfx_isolate_wrapper_unittest.cpp",
       "cfxjs_engine_unittest.cpp",
       "cjs_publicmethods_unittest.cpp",
       "cjs_util_unittest.cpp",

diff --git a/fxjs/cfx_isolate_wrapper.cpp b/fxjs/cfx_isolate_wrapper.cpp
new file mode 100644
index 0000000..08670f6
--- /dev/null
+++ b/fxjs/cfx_isolate_wrapper.cpp

@@ -0,0 +1,140 @@
+// Copyright 2017 The PDFium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "fxjs/cfx_isolate_wrapper.h"
+
+#include "fxjs/fxv8.h"
+#include "v8/include/v8-isolate.h"
+
+CFX_IsolateWrapper::CFX_IsolateWrapper(v8::Isolate* isolate)
+    : isolate_(isolate) {}
+
+CFX_IsolateWrapper::~CFX_IsolateWrapper() = default;
+
+v8::Local<v8::Value> CFX_IsolateWrapper::GetObjectPropertyReentrant(
+    v8::Local<v8::Object> pObj,
+    ByteStringView bsUTF8PropertyName) {
+  return fxv8::ReentrantGetObjectPropertyHelper(GetIsolate(), pObj,
+                                                bsUTF8PropertyName);
+}
+
+std::vector<WideString> CFX_IsolateWrapper::GetObjectPropertyNamesReentrant(
+    v8::Local<v8::Object> pObj) {
+  return fxv8::ReentrantGetObjectPropertyNamesHelper(GetIsolate(), pObj);
+}
+
+void CFX_IsolateWrapper::PutObjectPropertyReentrant(
+    v8::Local<v8::Object> pObj,
+    ByteStringView bsUTF8PropertyName,
+    v8::Local<v8::Value> pPut) {
+  fxv8::ReentrantPutObjectPropertyHelper(GetIsolate(), pObj, bsUTF8PropertyName,
+                                         pPut);
+}
+
+void CFX_IsolateWrapper::DisposeIsolate() {
+  if (isolate_) {
+    isolate_.ExtractAsDangling()->Dispose();
+  }
+}
+
+v8::Local<v8::Array> CFX_IsolateWrapper::NewArray() {
+  return fxv8::NewArrayHelper(GetIsolate());
+}
+
+v8::Local<v8::Object> CFX_IsolateWrapper::NewObject() {
+  return fxv8::NewObjectHelper(GetIsolate());
+}
+
+void CFX_IsolateWrapper::PutArrayElementReentrant(v8::Local<v8::Array> pArray,
+                                                  size_t index,
+                                                  v8::Local<v8::Value> pValue) {
+  fxv8::ReentrantPutArrayElementHelper(GetIsolate(), pArray, index, pValue);
+}
+
+v8::Local<v8::Value> CFX_IsolateWrapper::GetArrayElementReentrant(
+    v8::Local<v8::Array> pArray,
+    size_t index) {
+  return fxv8::ReentrantGetArrayElementHelper(GetIsolate(), pArray, index);
+}
+
+size_t CFX_IsolateWrapper::GetArrayLength(v8::Local<v8::Array> pArray) {
+  return fxv8::GetArrayLengthHelper(pArray);
+}
+
+v8::Local<v8::Number> CFX_IsolateWrapper::NewNumber(int number) {
+  return fxv8::NewNumberHelper(GetIsolate(), number);
+}
+
+v8::Local<v8::Number> CFX_IsolateWrapper::NewNumber(double number) {
+  return fxv8::NewNumberHelper(GetIsolate(), number);
+}
+
+v8::Local<v8::Number> CFX_IsolateWrapper::NewNumber(float number) {
+  return fxv8::NewNumberHelper(GetIsolate(), number);
+}
+
+v8::Local<v8::Boolean> CFX_IsolateWrapper::NewBoolean(bool b) {
+  return fxv8::NewBooleanHelper(GetIsolate(), b);
+}
+
+v8::Local<v8::String> CFX_IsolateWrapper::NewString(ByteStringView str) {
+  return fxv8::NewStringHelper(GetIsolate(), str);
+}
+
+v8::Local<v8::String> CFX_IsolateWrapper::NewString(WideStringView str) {
+  // Conversion from pdfium's wchar_t wide-strings to v8's uint16_t
+  // wide-strings isn't handled by v8, so use UTF8 as a common
+  // intermediate format.
+  return NewString(FX_UTF8Encode(str).AsStringView());
+}
+
+v8::Local<v8::Value> CFX_IsolateWrapper::NewNull() {
+  return fxv8::NewNullHelper(GetIsolate());
+}
+
+v8::Local<v8::Value> CFX_IsolateWrapper::NewUndefined() {
+  return fxv8::NewUndefinedHelper(GetIsolate());
+}
+
+v8::Local<v8::Date> CFX_IsolateWrapper::NewDate(double d) {
+  return fxv8::NewDateHelper(GetIsolate(), d);
+}
+
+int CFX_IsolateWrapper::ToInt32Reentrant(v8::Local<v8::Value> pValue) {
+  return fxv8::ReentrantToInt32Helper(GetIsolate(), pValue);
+}
+
+bool CFX_IsolateWrapper::ToBooleanReentrant(v8::Local<v8::Value> pValue) {
+  return fxv8::ReentrantToBooleanHelper(GetIsolate(), pValue);
+}
+
+double CFX_IsolateWrapper::ToDoubleReentrant(v8::Local<v8::Value> pValue) {
+  return fxv8::ReentrantToDoubleHelper(GetIsolate(), pValue);
+}
+
+WideString CFX_IsolateWrapper::ToWideStringReentrant(
+    v8::Local<v8::Value> pValue) {
+  return fxv8::ReentrantToWideStringHelper(GetIsolate(), pValue);
+}
+
+ByteString CFX_IsolateWrapper::ToByteStringReentrant(
+    v8::Local<v8::Value> pValue) {
+  return fxv8::ReentrantToByteStringHelper(GetIsolate(), pValue);
+}
+
+v8::Local<v8::Object> CFX_IsolateWrapper::ToObjectReentrant(
+    v8::Local<v8::Value> pValue) {
+  return fxv8::ReentrantToObjectHelper(GetIsolate(), pValue);
+}
+
+v8::Local<v8::Array> CFX_IsolateWrapper::ToArrayReentrant(
+    v8::Local<v8::Value> pValue) {
+  return fxv8::ReentrantToArrayHelper(GetIsolate(), pValue);
+}
+
+void CFX_V8IsolateDeleter::operator()(v8::Isolate* ptr) {
+  ptr->Dispose();
+}

diff --git a/fxjs/cfx_v8.h b/fxjs/cfx_isolate_wrapper.h
similarity index 91%
rename from fxjs/cfx_v8.h
rename to fxjs/cfx_isolate_wrapper.h
index 1f50359..adcbecc 100644
--- a/fxjs/cfx_v8.h
+++ b/fxjs/cfx_isolate_wrapper.h

@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CFX_V8_H_
-#define FXJS_CFX_V8_H_
+#ifndef FXJS_CFX_ISOLATE_WRAPPER_H_
+#define FXJS_CFX_ISOLATE_WRAPPER_H_
 
 #include <stddef.h>
 
@@ -15,10 +15,10 @@
 #include "core/fxcrt/unowned_ptr.h"
 #include "v8/include/v8-forward.h"
 
-class CFX_V8 {
+class CFX_IsolateWrapper {
  public:
-  explicit CFX_V8(v8::Isolate* pIsolate);
-  virtual ~CFX_V8();
+  explicit CFX_IsolateWrapper(v8::Isolate* pIsolate);
+  virtual ~CFX_IsolateWrapper();
 
   v8::Isolate* GetIsolate() const { return isolate_; }
 
@@ -73,4 +73,4 @@
   void operator()(v8::Isolate* ptr);
 };
 
-#endif  // FXJS_CFX_V8_H_
+#endif  // FXJS_CFX_ISOLATE_WRAPPER_H_

diff --git a/fxjs/cfx_v8_unittest.cpp b/fxjs/cfx_isolate_wrapper_unittest.cpp
similarity index 92%
rename from fxjs/cfx_v8_unittest.cpp
rename to fxjs/cfx_isolate_wrapper_unittest.cpp
index 4e88bc5..0b1fbc3 100644
--- a/fxjs/cfx_v8_unittest.cpp
+++ b/fxjs/cfx_isolate_wrapper_unittest.cpp

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 
 #include <math.h>
 
@@ -20,24 +20,24 @@
 bool setter_sentinel = false;
 }  // namespace
 
-class CFXV8UnitTest : public FXV8UnitTest {
+class CFXIsolateWrapperUnitTest : public FXV8UnitTest {
  public:
-  CFXV8UnitTest() = default;
-  ~CFXV8UnitTest() override = default;
+  CFXIsolateWrapperUnitTest() = default;
+  ~CFXIsolateWrapperUnitTest() override = default;
 
   // FXV8UnitTest:
   void SetUp() override {
     FXV8UnitTest::SetUp();
-    cfx_v8_ = std::make_unique<CFX_V8>(isolate());
+    cfx_v8_ = std::make_unique<CFX_IsolateWrapper>(isolate());
   }
 
-  CFX_V8* cfx_v8() const { return cfx_v8_.get(); }
+  CFX_IsolateWrapper* cfx_v8() const { return cfx_v8_.get(); }
 
  protected:
-  std::unique_ptr<CFX_V8> cfx_v8_;
+  std::unique_ptr<CFX_IsolateWrapper> cfx_v8_;
 };
 
-TEST_F(CFXV8UnitTest, EmptyLocal) {
+TEST_F(CFXIsolateWrapperUnitTest, EmptyLocal) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(v8::Context::New(isolate()));
@@ -66,7 +66,7 @@
   EXPECT_EQ(0u, cfx_v8()->GetArrayLength(empty_array));
 }
 
-TEST_F(CFXV8UnitTest, NewNull) {
+TEST_F(CFXIsolateWrapperUnitTest, NewNull) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(v8::Context::New(isolate()));
@@ -81,7 +81,7 @@
   EXPECT_TRUE(cfx_v8()->ToArrayReentrant(nullz).IsEmpty());
 }
 
-TEST_F(CFXV8UnitTest, NewUndefined) {
+TEST_F(CFXIsolateWrapperUnitTest, NewUndefined) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(v8::Context::New(isolate()));
@@ -96,7 +96,7 @@
   EXPECT_TRUE(cfx_v8()->ToArrayReentrant(undef).IsEmpty());
 }
 
-TEST_F(CFXV8UnitTest, NewBoolean) {
+TEST_F(CFXIsolateWrapperUnitTest, NewBoolean) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(v8::Context::New(isolate()));
@@ -120,7 +120,7 @@
   EXPECT_TRUE(cfx_v8()->ToArrayReentrant(boolz).IsEmpty());
 }
 
-TEST_F(CFXV8UnitTest, NewNumber) {
+TEST_F(CFXIsolateWrapperUnitTest, NewNumber) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(v8::Context::New(isolate()));
@@ -135,7 +135,7 @@
   EXPECT_TRUE(cfx_v8()->ToArrayReentrant(num).IsEmpty());
 }
 
-TEST_F(CFXV8UnitTest, NewString) {
+TEST_F(CFXIsolateWrapperUnitTest, NewString) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(v8::Context::New(isolate()));
@@ -159,7 +159,7 @@
   EXPECT_TRUE(cfx_v8()->ToArrayReentrant(str2).IsEmpty());
 }
 
-TEST_F(CFXV8UnitTest, NewDate) {
+TEST_F(CFXIsolateWrapperUnitTest, NewDate) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(v8::Context::New(isolate()));
@@ -175,7 +175,7 @@
   EXPECT_TRUE(cfx_v8()->ToArrayReentrant(date).IsEmpty());
 }
 
-TEST_F(CFXV8UnitTest, NewArray) {
+TEST_F(CFXIsolateWrapperUnitTest, NewArray) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(v8::Context::New(isolate()));
@@ -202,7 +202,7 @@
   EXPECT_TRUE(cfx_v8()->ToArrayReentrant(array)->IsArray());
 }
 
-TEST_F(CFXV8UnitTest, NewObject) {
+TEST_F(CFXIsolateWrapperUnitTest, NewObject) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(v8::Context::New(isolate()));
@@ -232,7 +232,7 @@
   EXPECT_TRUE(cfx_v8()->ToArrayReentrant(object).IsEmpty());
 }
 
-TEST_F(CFXV8UnitTest, ThrowFromGetter) {
+TEST_F(CFXIsolateWrapperUnitTest, ThrowFromGetter) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Local<v8::Context> context = v8::Context::New(isolate());
@@ -254,7 +254,7 @@
   EXPECT_TRUE(getter_sentinel);
 }
 
-TEST_F(CFXV8UnitTest, ThrowFromSetter) {
+TEST_F(CFXIsolateWrapperUnitTest, ThrowFromSetter) {
   v8::Isolate::Scope isolate_scope(isolate());
   v8::HandleScope handle_scope(isolate());
   v8::Local<v8::Context> context = v8::Context::New(isolate());

diff --git a/fxjs/cfx_v8.cpp b/fxjs/cfx_v8.cpp
deleted file mode 100644
index 49f9c96..0000000
--- a/fxjs/cfx_v8.cpp
+++ /dev/null

@@ -1,134 +0,0 @@
-// Copyright 2017 The PDFium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "fxjs/cfx_v8.h"
-
-#include "fxjs/fxv8.h"
-#include "v8/include/v8-isolate.h"
-
-CFX_V8::CFX_V8(v8::Isolate* isolate) : isolate_(isolate) {}
-
-CFX_V8::~CFX_V8() = default;
-
-v8::Local<v8::Value> CFX_V8::GetObjectPropertyReentrant(
-    v8::Local<v8::Object> pObj,
-    ByteStringView bsUTF8PropertyName) {
-  return fxv8::ReentrantGetObjectPropertyHelper(GetIsolate(), pObj,
-                                                bsUTF8PropertyName);
-}
-
-std::vector<WideString> CFX_V8::GetObjectPropertyNamesReentrant(
-    v8::Local<v8::Object> pObj) {
-  return fxv8::ReentrantGetObjectPropertyNamesHelper(GetIsolate(), pObj);
-}
-
-void CFX_V8::PutObjectPropertyReentrant(v8::Local<v8::Object> pObj,
-                                        ByteStringView bsUTF8PropertyName,
-                                        v8::Local<v8::Value> pPut) {
-  fxv8::ReentrantPutObjectPropertyHelper(GetIsolate(), pObj, bsUTF8PropertyName,
-                                         pPut);
-}
-
-void CFX_V8::DisposeIsolate() {
-  if (isolate_) {
-    isolate_.ExtractAsDangling()->Dispose();
-  }
-}
-
-v8::Local<v8::Array> CFX_V8::NewArray() {
-  return fxv8::NewArrayHelper(GetIsolate());
-}
-
-v8::Local<v8::Object> CFX_V8::NewObject() {
-  return fxv8::NewObjectHelper(GetIsolate());
-}
-
-void CFX_V8::PutArrayElementReentrant(v8::Local<v8::Array> pArray,
-                                      size_t index,
-                                      v8::Local<v8::Value> pValue) {
-  fxv8::ReentrantPutArrayElementHelper(GetIsolate(), pArray, index, pValue);
-}
-
-v8::Local<v8::Value> CFX_V8::GetArrayElementReentrant(
-    v8::Local<v8::Array> pArray,
-    size_t index) {
-  return fxv8::ReentrantGetArrayElementHelper(GetIsolate(), pArray, index);
-}
-
-size_t CFX_V8::GetArrayLength(v8::Local<v8::Array> pArray) {
-  return fxv8::GetArrayLengthHelper(pArray);
-}
-
-v8::Local<v8::Number> CFX_V8::NewNumber(int number) {
-  return fxv8::NewNumberHelper(GetIsolate(), number);
-}
-
-v8::Local<v8::Number> CFX_V8::NewNumber(double number) {
-  return fxv8::NewNumberHelper(GetIsolate(), number);
-}
-
-v8::Local<v8::Number> CFX_V8::NewNumber(float number) {
-  return fxv8::NewNumberHelper(GetIsolate(), number);
-}
-
-v8::Local<v8::Boolean> CFX_V8::NewBoolean(bool b) {
-  return fxv8::NewBooleanHelper(GetIsolate(), b);
-}
-
-v8::Local<v8::String> CFX_V8::NewString(ByteStringView str) {
-  return fxv8::NewStringHelper(GetIsolate(), str);
-}
-
-v8::Local<v8::String> CFX_V8::NewString(WideStringView str) {
-  // Conversion from pdfium's wchar_t wide-strings to v8's uint16_t
-  // wide-strings isn't handled by v8, so use UTF8 as a common
-  // intermediate format.
-  return NewString(FX_UTF8Encode(str).AsStringView());
-}
-
-v8::Local<v8::Value> CFX_V8::NewNull() {
-  return fxv8::NewNullHelper(GetIsolate());
-}
-
-v8::Local<v8::Value> CFX_V8::NewUndefined() {
-  return fxv8::NewUndefinedHelper(GetIsolate());
-}
-
-v8::Local<v8::Date> CFX_V8::NewDate(double d) {
-  return fxv8::NewDateHelper(GetIsolate(), d);
-}
-
-int CFX_V8::ToInt32Reentrant(v8::Local<v8::Value> pValue) {
-  return fxv8::ReentrantToInt32Helper(GetIsolate(), pValue);
-}
-
-bool CFX_V8::ToBooleanReentrant(v8::Local<v8::Value> pValue) {
-  return fxv8::ReentrantToBooleanHelper(GetIsolate(), pValue);
-}
-
-double CFX_V8::ToDoubleReentrant(v8::Local<v8::Value> pValue) {
-  return fxv8::ReentrantToDoubleHelper(GetIsolate(), pValue);
-}
-
-WideString CFX_V8::ToWideStringReentrant(v8::Local<v8::Value> pValue) {
-  return fxv8::ReentrantToWideStringHelper(GetIsolate(), pValue);
-}
-
-ByteString CFX_V8::ToByteStringReentrant(v8::Local<v8::Value> pValue) {
-  return fxv8::ReentrantToByteStringHelper(GetIsolate(), pValue);
-}
-
-v8::Local<v8::Object> CFX_V8::ToObjectReentrant(v8::Local<v8::Value> pValue) {
-  return fxv8::ReentrantToObjectHelper(GetIsolate(), pValue);
-}
-
-v8::Local<v8::Array> CFX_V8::ToArrayReentrant(v8::Local<v8::Value> pValue) {
-  return fxv8::ReentrantToArrayHelper(GetIsolate(), pValue);
-}
-
-void CFX_V8IsolateDeleter::operator()(v8::Isolate* ptr) {
-  ptr->Dispose();
-}

diff --git a/fxjs/cfxjs_engine.cpp b/fxjs/cfxjs_engine.cpp
index 27d612f..85c1ad1 100644
--- a/fxjs/cfxjs_engine.cpp
+++ b/fxjs/cfxjs_engine.cpp

@@ -399,9 +399,10 @@
   return CurrentMaxObjDefinitionID();
 }
 
-CFXJS_Engine::CFXJS_Engine() : CFX_V8(nullptr) {}
+CFXJS_Engine::CFXJS_Engine() : CFX_IsolateWrapper(nullptr) {}
 
-CFXJS_Engine::CFXJS_Engine(v8::Isolate* pIsolate) : CFX_V8(pIsolate) {}
+CFXJS_Engine::CFXJS_Engine(v8::Isolate* pIsolate)
+    : CFX_IsolateWrapper(pIsolate) {}
 
 CFXJS_Engine::~CFXJS_Engine() = default;
 

diff --git a/fxjs/cfxjs_engine.h b/fxjs/cfxjs_engine.h
index 65192bd..bcdd0c4 100644
--- a/fxjs/cfxjs_engine.h
+++ b/fxjs/cfxjs_engine.h

@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "core/fxcrt/widestring.h"
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "fxjs/ijs_runtime.h"
 #include "v8/include/v8-forward.h"
 #include "v8/include/v8-function-callback.h"
@@ -107,7 +107,7 @@
 // Get the global isolate's ref count.
 size_t FXJS_GlobalIsolateRefCount();
 
-class CFXJS_Engine : public CFX_V8 {
+class CFXJS_Engine : public CFX_IsolateWrapper {
  public:
   explicit CFXJS_Engine(v8::Isolate* pIsolate);
   ~CFXJS_Engine() override;

diff --git a/fxjs/xfa/cfxjse_engine.cpp b/fxjs/xfa/cfxjse_engine.cpp
index 6960b47..ed6a65c 100644
--- a/fxjs/xfa/cfxjse_engine.cpp
+++ b/fxjs/xfa/cfxjse_engine.cpp

@@ -144,7 +144,7 @@
 }
 
 CFXJSE_Engine::CFXJSE_Engine(CXFA_Document* document, CJS_Runtime* fxjs_runtime)
-    : CFX_V8(fxjs_runtime->GetIsolate()),
+    : CFX_IsolateWrapper(fxjs_runtime->GetIsolate()),
       subordinate_runtime_(fxjs_runtime),
       document_(document),
       js_context_(CFXJSE_Context::Create(fxjs_runtime->GetIsolate(),

diff --git a/fxjs/xfa/cfxjse_engine.h b/fxjs/xfa/cfxjse_engine.h
index 6e907a7..04401e9 100644
--- a/fxjs/xfa/cfxjse_engine.h
+++ b/fxjs/xfa/cfxjse_engine.h

@@ -14,7 +14,7 @@
 
 #include "core/fxcrt/mask.h"
 #include "core/fxcrt/unowned_ptr.h"
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "fxjs/xfa/cfxjse_context.h"
 #include "v8/include/cppgc/persistent.h"
 #include "v8/include/v8-forward.h"
@@ -45,7 +45,7 @@
   kBindNew = 1 << 12,
 };
 
-class CFXJSE_Engine final : public CFX_V8 {
+class CFXJSE_Engine final : public CFX_IsolateWrapper {
  public:
   class ResolveResult {
     CPPGC_STACK_ALLOCATED();  // Allow raw/unowned pointers.

diff --git a/fxjs/xfa/cjx_desc.cpp b/fxjs/xfa/cjx_desc.cpp
index 6ab3a55..c8ead4d 100644
--- a/fxjs/xfa/cjx_desc.cpp
+++ b/fxjs/xfa/cjx_desc.cpp

@@ -7,7 +7,7 @@
 #include "fxjs/xfa/cjx_desc.h"
 
 #include "core/fxcrt/span.h"
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "fxjs/js_resources.h"
 #include "v8/include/v8-primitive.h"
 #include "xfa/fxfa/parser/cxfa_desc.h"

diff --git a/fxjs/xfa/cjx_field.cpp b/fxjs/xfa/cjx_field.cpp
index d407e88..02b58ed 100644
--- a/fxjs/xfa/cjx_field.cpp
+++ b/fxjs/xfa/cjx_field.cpp

@@ -8,7 +8,7 @@
 
 #include "core/fxcrt/numerics/safe_conversions.h"
 #include "core/fxcrt/span.h"
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "fxjs/fxv8.h"
 #include "fxjs/js_resources.h"
 #include "v8/include/v8-primitive.h"

diff --git a/fxjs/xfa/cjx_manifest.cpp b/fxjs/xfa/cjx_manifest.cpp
index ede949f..0cceaae 100644
--- a/fxjs/xfa/cjx_manifest.cpp
+++ b/fxjs/xfa/cjx_manifest.cpp

@@ -7,7 +7,7 @@
 #include "fxjs/xfa/cjx_manifest.h"
 
 #include "core/fxcrt/span.h"
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "fxjs/js_resources.h"
 #include "v8/include/v8-primitive.h"
 #include "xfa/fxfa/parser/cxfa_manifest.h"

diff --git a/fxjs/xfa/cjx_packet.cpp b/fxjs/xfa/cjx_packet.cpp
index 400c365..1aea31f 100644
--- a/fxjs/xfa/cjx_packet.cpp
+++ b/fxjs/xfa/cjx_packet.cpp

@@ -12,7 +12,7 @@
 #include "core/fxcrt/xml/cfx_xmldocument.h"
 #include "core/fxcrt/xml/cfx_xmlelement.h"
 #include "core/fxcrt/xml/cfx_xmltext.h"
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "fxjs/fxv8.h"
 #include "fxjs/js_resources.h"
 #include "v8/include/v8-primitive.h"

diff --git a/fxjs/xfa/cjx_subform.cpp b/fxjs/xfa/cjx_subform.cpp
index 5db5ff2..0314fce 100644
--- a/fxjs/xfa/cjx_subform.cpp
+++ b/fxjs/xfa/cjx_subform.cpp

@@ -7,7 +7,7 @@
 #include "fxjs/xfa/cjx_subform.h"
 
 #include "core/fxcrt/span.h"
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "fxjs/fxv8.h"
 #include "fxjs/js_resources.h"
 #include "fxjs/xfa/cfxjse_engine.h"

diff --git a/fxjs/xfa/cjx_template.cpp b/fxjs/xfa/cjx_template.cpp
index 24caf32..358cb3d 100644
--- a/fxjs/xfa/cjx_template.cpp
+++ b/fxjs/xfa/cjx_template.cpp

@@ -7,7 +7,7 @@
 #include "fxjs/xfa/cjx_template.h"
 
 #include "core/fxcrt/span.h"
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "fxjs/js_resources.h"
 #include "v8/include/v8-primitive.h"
 #include "xfa/fxfa/parser/cxfa_document.h"

diff --git a/fxjs/xfa/cjx_wsdlconnection.cpp b/fxjs/xfa/cjx_wsdlconnection.cpp
index 114aaeb..30c5699 100644
--- a/fxjs/xfa/cjx_wsdlconnection.cpp
+++ b/fxjs/xfa/cjx_wsdlconnection.cpp

@@ -7,7 +7,7 @@
 #include "fxjs/xfa/cjx_wsdlconnection.h"
 
 #include "core/fxcrt/span.h"
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "fxjs/js_resources.h"
 #include "v8/include/v8-primitive.h"
 #include "xfa/fxfa/parser/cxfa_wsdlconnection.h"

diff --git a/testing/fuzzers/pdf_fuzzer_init_public.h b/testing/fuzzers/pdf_fuzzer_init_public.h
index 4b7f46f..f7cd96f 100644
--- a/testing/fuzzers/pdf_fuzzer_init_public.h
+++ b/testing/fuzzers/pdf_fuzzer_init_public.h

@@ -11,7 +11,7 @@
 #include "public/fpdfview.h"
 
 #ifdef PDF_ENABLE_V8
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "v8/include/v8-array-buffer.h"
 #include "v8/include/v8-snapshot.h"
 #endif  // PDF_ENABLE_V8

diff --git a/testing/fxv8_unittest.h b/testing/fxv8_unittest.h
index 0757c73..221a27e 100644
--- a/testing/fxv8_unittest.h
+++ b/testing/fxv8_unittest.h

@@ -9,7 +9,6 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-class CFX_V8;
 class CFX_V8ArrayBufferAllocator;
 
 namespace v8 {

diff --git a/testing/v8_test_environment.h b/testing/v8_test_environment.h
index 7a030e4..bf21b2c 100644
--- a/testing/v8_test_environment.h
+++ b/testing/v8_test_environment.h

@@ -11,7 +11,7 @@
 
 #include <memory>
 
-#include "fxjs/cfx_v8.h"
+#include "fxjs/cfx_isolate_wrapper.h"
 #include "fxjs/cfx_v8_array_buffer_allocator.h"
 #include "testing/gtest/include/gtest/gtest.h"