Setup and tear down V8 if the PDF module is not managed via pepper

pdf/pdf.cc

Index: pdf/pdf.cc
diff --git a/pdf/pdf.cc b/pdf/pdf.cc
index 1f580e4f1532a7d543314d2e3f1f87f0d1851f30..9521fdfa4446202f384a5556e3189a86ec3f926e 100644
--- a/pdf/pdf.cc
+++ b/pdf/pdf.cc
@@ -10,8 +10,6 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "gin/array_buffer.h"
-#include "gin/public/isolate_holder.h"
 #include "pdf/out_of_process_instance.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/cpp/private/internal_module.h"
@@ -24,14 +22,6 @@ namespace {
 
 bool g_sdk_initialized_via_pepper = false;
 
-gin::IsolateHolder* g_isolate_holder = nullptr;
-
-void TearDownV8() {
-  g_isolate_holder->isolate()->Exit();
-  delete g_isolate_holder;
-  g_isolate_holder = nullptr;
-}
-
 }  // namespace
 
 PDFModule::PDFModule() {
@@ -39,7 +29,6 @@ PDFModule::PDFModule() {
 
 PDFModule::~PDFModule() {
   if (g_sdk_initialized_via_pepper) {
-    TearDownV8();
     chrome_pdf::ShutdownSDK();
     g_sdk_initialized_via_pepper = false;
   }
@@ -60,15 +49,8 @@ pp::Instance* PDFModule::CreateInstance(PP_Instance instance) {
       v8::V8::SetNativesDataBlob(&natives);
       v8::V8::SetSnapshotDataBlob(&snapshot);
     }
-    gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
-                                   gin::ArrayBufferAllocator::SharedInstance());
-    g_isolate_holder =
-        new gin::IsolateHolder(gin::IsolateHolder::kSingleThread);
-    g_isolate_holder->isolate()->Enter();
-    if (!chrome_pdf::InitializeSDK()) {
-      TearDownV8();
+    if (!chrome_pdf::InitializeSDK())
       return NULL;
-    }
     g_sdk_initialized_via_pepper = true;
   }