Push v8::Isolate into CFXJS_Engine classchromium/2831

Nearly all the "loose" functions in FXJS become methods on
the CFJXS_Engine.

This is the "missing link" wrt some layering violatons that
have been around forever. We can stop passing &m_ variables
from CJS_ down into FXJS Initialization as a result.

Review-Url: https://codereview.chromium.org/2245863002

1 files changed, 6 insertions, 5 deletions

diff --git a/testing/js_embedder_test.cpp b/testing/js_embedder_test.cpp
index 1b21fe04db..f7aa7e38f7 100644
--- a/testing/js_embedder_test.cpp
+++ b/testing/js_embedder_test.cpp
@@ -21,13 +21,14 @@ void JSEmbedderTest::SetUp() {
   v8::Isolate::Scope isolate_scope(m_pIsolate);
   v8::HandleScope handle_scope(m_pIsolate);
   FXJS_PerIsolateData::SetUp(m_pIsolate);
-  FXJS_InitializeEngine(m_pIsolate, nullptr, &m_pPersistentContext,
-                        &m_StaticObjects);
+  m_Engine.reset(new CFXJS_Engine);
+  m_Engine->SetIsolate(m_pIsolate);
+  m_Engine->InitializeEngine();
 }
 
 void JSEmbedderTest::TearDown() {
-  FXJS_ReleaseEngine(m_pIsolate, &m_pPersistentContext, &m_StaticObjects);
-  m_pPersistentContext.Reset();
+  m_Engine->ReleaseEngine();
+  m_Engine.reset();
   EmbedderTest::TearDown();
   m_pIsolate->Dispose();
   m_pIsolate = nullptr;
@@ -38,5 +39,5 @@ v8::Isolate* JSEmbedderTest::isolate() {
 }
 
 v8::Local<v8::Context> JSEmbedderTest::GetV8Context() {
-  return m_pPersistentContext.Get(m_pIsolate);
+  return m_Engine->GetPersistentContext();
 }