Reland: Make the CPDFXFA_App non-global

fpdfsdk/fpdfxfa/cpdfxfa_app.h

Index: fpdfsdk/fpdfxfa/cpdfxfa_app.h
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_app.h b/fpdfsdk/fpdfxfa/cpdfxfa_app.h
index 78184d1434ab0a79b5f4a03a035080a6db8bdfd4..ca25c0c808c11385440b1b593531f88957dbb6e3 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_app.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_app.h
@@ -7,31 +7,22 @@
 #ifndef FPDFSDK_FPDFXFA_CPDFXFA_APP_H_
 #define FPDFSDK_FPDFXFA_CPDFXFA_APP_H_
 
+#include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/fxfa.h"
 
 class CPDFSDK_FormFillEnvironment;
-class IFXJS_Runtime;
+class CJS_Runtime;
 
 class CPDFXFA_App : public IXFA_AppProvider {
  public:
-  static CPDFXFA_App* GetInstance();
-  static void ReleaseInstance();
-
   CPDFXFA_App();
   ~CPDFXFA_App() override;
 
-  FX_BOOL Initialize(v8::Isolate* pIsolate);
   CXFA_FFApp* GetXFAApp() { return m_pXFAApp.get(); }
 
-  FX_BOOL AddFormFillEnv(CPDFSDK_FormFillEnvironment* pFormFillEnv);
-  FX_BOOL RemoveFormFillEnv(CPDFSDK_FormFillEnvironment* pFormFillEnv);
-
-  FX_BOOL IsJavaScriptInitialized() const { return m_bJavaScriptInitialized; }
-  void SetJavaScriptInitialized(FX_BOOL bInitialized) {
-    m_bJavaScriptInitialized = bInitialized;
-  }
+  void SetFormFillEnv(CPDFSDK_FormFillEnvironment* pFormFillEnv);
 
-  v8::Isolate* GetJSERuntime() const { return m_pIsolate; }
+  v8::Isolate* GetJSERuntime() const;
 
   // IFXA_AppProvider:
   void GetLanguage(CFX_WideString& wsLanguage) override;
@@ -62,12 +53,10 @@ class CPDFXFA_App : public IXFA_AppProvider {
   void LoadString(int32_t iStringID, CFX_WideString& wsString) override;
   IFWL_AdapterTimerMgr* GetTimerMgr() override;
 
-  CFX_ArrayTemplate<CPDFSDK_FormFillEnvironment*> m_pFormFillEnvList;
-
- protected:
-  FX_BOOL m_bJavaScriptInitialized;
+ private:
+  CPDFSDK_FormFillEnvironment* m_pFormFillEnv;  // Not owned.
   std::unique_ptr<CXFA_FFApp> m_pXFAApp;
-  v8::Isolate* m_pIsolate;
+  std::unique_ptr<CJS_Runtime> m_pRuntime;
 };
 
 #endif  // FPDFSDK_FPDFXFA_CPDFXFA_APP_H_