[xfa] Move CJX code into fxjs/xfa

This CL moves the remaining CJX clases into fxjs/xfa so they co-exist
with the rest of the CJX classes.

Change-Id: I2b1e5504ac23f73df177f309967a04ab27fb61d1
Reviewed-on: https://pdfium-review.googlesource.com/20550
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

44 files changed, 88 insertions, 124 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 7a35526b7c..ac86f805de 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1307,49 +1307,47 @@ static_library("fxjs") {
         "fxjs/cfxjse_runtimedata.h",
         "fxjs/cfxjse_value.cpp",
         "fxjs/cfxjse_value.h",
-        "fxjs/cjx_datawindow.cpp",
-        "fxjs/cjx_datawindow.h",
-        "fxjs/cjx_eventpseudomodel.cpp",
-        "fxjs/cjx_eventpseudomodel.h",
-        "fxjs/cjx_hostpseudomodel.cpp",
-        "fxjs/cjx_hostpseudomodel.h",
-        "fxjs/cjx_layoutpseudomodel.cpp",
-        "fxjs/cjx_layoutpseudomodel.h",
-        "fxjs/cjx_logpseudomodel.cpp",
-        "fxjs/cjx_logpseudomodel.h",
-        "fxjs/cjx_node.cpp",
-        "fxjs/cjx_node.h",
-        "fxjs/cjx_object.cpp",
-        "fxjs/cjx_object.h",
-        "fxjs/cjx_signaturepseudomodel.cpp",
-        "fxjs/cjx_signaturepseudomodel.h",
-        "fxjs/cjx_thisproxy.cpp",
-        "fxjs/cjx_thisproxy.h",
         "fxjs/fxjse.h",
         "fxjs/xfa/cjx_container.cpp",
         "fxjs/xfa/cjx_container.h",
         "fxjs/xfa/cjx_content.cpp",
         "fxjs/xfa/cjx_content.h",
+        "fxjs/xfa/cjx_datawindow.cpp",
+        "fxjs/xfa/cjx_datawindow.h",
         "fxjs/xfa/cjx_delta.cpp",
         "fxjs/xfa/cjx_delta.h",
         "fxjs/xfa/cjx_desc.cpp",
         "fxjs/xfa/cjx_desc.h",
+        "fxjs/xfa/cjx_eventpseudomodel.cpp",
+        "fxjs/xfa/cjx_eventpseudomodel.h",
         "fxjs/xfa/cjx_exclgroup.cpp",
         "fxjs/xfa/cjx_exclgroup.h",
         "fxjs/xfa/cjx_field.cpp",
         "fxjs/xfa/cjx_field.h",
         "fxjs/xfa/cjx_form.cpp",
         "fxjs/xfa/cjx_form.h",
+        "fxjs/xfa/cjx_hostpseudomodel.cpp",
+        "fxjs/xfa/cjx_hostpseudomodel.h",
         "fxjs/xfa/cjx_instancemanager.cpp",
         "fxjs/xfa/cjx_instancemanager.h",
+        "fxjs/xfa/cjx_layoutpseudomodel.cpp",
+        "fxjs/xfa/cjx_layoutpseudomodel.h",
         "fxjs/xfa/cjx_list.cpp",
         "fxjs/xfa/cjx_list.h",
+        "fxjs/xfa/cjx_logpseudomodel.cpp",
+        "fxjs/xfa/cjx_logpseudomodel.h",
         "fxjs/xfa/cjx_manifest.cpp",
         "fxjs/xfa/cjx_manifest.h",
         "fxjs/xfa/cjx_model.cpp",
         "fxjs/xfa/cjx_model.h",
+        "fxjs/xfa/cjx_node.cpp",
+        "fxjs/xfa/cjx_node.h",
+        "fxjs/xfa/cjx_object.cpp",
+        "fxjs/xfa/cjx_object.h",
         "fxjs/xfa/cjx_packet.cpp",
         "fxjs/xfa/cjx_packet.h",
+        "fxjs/xfa/cjx_signaturepseudomodel.cpp",
+        "fxjs/xfa/cjx_signaturepseudomodel.h",
         "fxjs/xfa/cjx_source.cpp",
         "fxjs/xfa/cjx_source.h",
         "fxjs/xfa/cjx_subform.cpp",
diff --git a/fxjs/cjx_thisproxy.cpp b/fxjs/cjx_thisproxy.cpp
deleted file mode 100644
index 281bb44ede..0000000000
--- a/fxjs/cjx_thisproxy.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 PDFium Authors. All rights reserved.
-// 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/cjx_thisproxy.h"
-
-#include "xfa/fxfa/parser/cxfa_thisproxy.h"
-
-CJX_ThisProxy::CJX_ThisProxy(CXFA_ThisProxy* proxy) : CJX_Object(proxy) {}
-
-CJX_ThisProxy::~CJX_ThisProxy() {}
diff --git a/fxjs/cjx_thisproxy.h b/fxjs/cjx_thisproxy.h
deleted file mode 100644
index 397589b5a1..0000000000
--- a/fxjs/cjx_thisproxy.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 PDFium Authors. All rights reserved.
-// 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
-
-#ifndef FXJS_CJX_THISPROXY_H_
-#define FXJS_CJX_THISPROXY_H_
-
-#include "fxjs/cjx_object.h"
-
-class CXFA_ThisProxy;
-
-class CJX_ThisProxy : public CJX_Object {
- public:
-  explicit CJX_ThisProxy(CXFA_ThisProxy* proxy);
-  ~CJX_ThisProxy() override;
-};
-
-#endif  // FXJS_CJX_THISPROXY_H_
diff --git a/fxjs/xfa/cjx_container.h b/fxjs/xfa/cjx_container.h
index 41d11cfd69..0e2170fa2a 100644
--- a/fxjs/xfa/cjx_container.h
+++ b/fxjs/xfa/cjx_container.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_CONTAINER_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Node;
 
diff --git a/fxjs/xfa/cjx_content.h b/fxjs/xfa/cjx_content.h
index cd2e71a776..983a75005d 100644
--- a/fxjs/xfa/cjx_content.h
+++ b/fxjs/xfa/cjx_content.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_CONTENT_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CXFA_Content;
 
diff --git a/fxjs/cjx_datawindow.cpp b/fxjs/xfa/cjx_datawindow.cpp
index b642356f05..54f32047fc 100644
--- a/fxjs/cjx_datawindow.cpp
+++ b/fxjs/xfa/cjx_datawindow.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_datawindow.h"
+#include "fxjs/xfa/cjx_datawindow.h"
 
 #include <vector>
 
diff --git a/fxjs/cjx_datawindow.h b/fxjs/xfa/cjx_datawindow.h
index e7c39edad8..82c5b1a9d1 100644
--- a/fxjs/cjx_datawindow.h
+++ b/fxjs/xfa/cjx_datawindow.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_DATAWINDOW_H_
-#define FXJS_CJX_DATAWINDOW_H_
+#ifndef FXJS_XFA_CJX_DATAWINDOW_H_
+#define FXJS_XFA_CJX_DATAWINDOW_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
 class CFXJSE_Value;
@@ -39,4 +39,4 @@ class CJX_DataWindow : public CJX_Object {
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_DATAWINDOW_H_
+#endif  // FXJS_XFA_CJX_DATAWINDOW_H_
diff --git a/fxjs/xfa/cjx_delta.h b/fxjs/xfa/cjx_delta.h
index d9a2c6290e..29d3e8e788 100644
--- a/fxjs/xfa/cjx_delta.h
+++ b/fxjs/xfa/cjx_delta.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_DELTA_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CXFA_Delta;
 
diff --git a/fxjs/xfa/cjx_desc.h b/fxjs/xfa/cjx_desc.h
index 602633d482..f3c9f46b4c 100644
--- a/fxjs/xfa/cjx_desc.h
+++ b/fxjs/xfa/cjx_desc.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_DESC_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Desc;
 
diff --git a/fxjs/cjx_eventpseudomodel.cpp b/fxjs/xfa/cjx_eventpseudomodel.cpp
index 092d39fa28..a109d1cb70 100644
--- a/fxjs/cjx_eventpseudomodel.cpp
+++ b/fxjs/xfa/cjx_eventpseudomodel.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_eventpseudomodel.h"
+#include "fxjs/xfa/cjx_eventpseudomodel.h"
 
 #include <vector>
 
diff --git a/fxjs/cjx_eventpseudomodel.h b/fxjs/xfa/cjx_eventpseudomodel.h
index 08cca73a3d..d9615c3269 100644
--- a/fxjs/cjx_eventpseudomodel.h
+++ b/fxjs/xfa/cjx_eventpseudomodel.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_EVENTPSEUDOMODEL_H_
-#define FXJS_CJX_EVENTPSEUDOMODEL_H_
+#ifndef FXJS_XFA_CJX_EVENTPSEUDOMODEL_H_
+#define FXJS_XFA_CJX_EVENTPSEUDOMODEL_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CFXJSE_Value;
 class CScript_EventPseudoModel;
@@ -72,4 +72,4 @@ class CJX_EventPseudoModel : public CJX_Object {
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_EVENTPSEUDOMODEL_H_
+#endif  // FXJS_XFA_CJX_EVENTPSEUDOMODEL_H_
diff --git a/fxjs/xfa/cjx_exclgroup.h b/fxjs/xfa/cjx_exclgroup.h
index 2ef280e17a..f44446762f 100644
--- a/fxjs/xfa/cjx_exclgroup.h
+++ b/fxjs/xfa/cjx_exclgroup.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_EXCLGROUP_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_ExclGroup;
 
diff --git a/fxjs/cjx_hostpseudomodel.cpp b/fxjs/xfa/cjx_hostpseudomodel.cpp
index c4467b8755..20e3bfe496 100644
--- a/fxjs/cjx_hostpseudomodel.cpp
+++ b/fxjs/xfa/cjx_hostpseudomodel.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_hostpseudomodel.h"
+#include "fxjs/xfa/cjx_hostpseudomodel.h"
 
 #include <memory>
 #include <vector>
diff --git a/fxjs/cjx_hostpseudomodel.h b/fxjs/xfa/cjx_hostpseudomodel.h
index e77a37ee6b..fa3277a2c9 100644
--- a/fxjs/cjx_hostpseudomodel.h
+++ b/fxjs/xfa/cjx_hostpseudomodel.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_HOSTPSEUDOMODEL_H_
-#define FXJS_CJX_HOSTPSEUDOMODEL_H_
+#ifndef FXJS_XFA_CJX_HOSTPSEUDOMODEL_H_
+#define FXJS_XFA_CJX_HOSTPSEUDOMODEL_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
 class CFXJSE_Value;
@@ -57,4 +57,4 @@ class CJX_HostPseudoModel : public CJX_Object {
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_HOSTPSEUDOMODEL_H_
+#endif  // FXJS_XFA_CJX_HOSTPSEUDOMODEL_H_
diff --git a/fxjs/xfa/cjx_instancemanager.h b/fxjs/xfa/cjx_instancemanager.h
index a312366b3b..1fd41a6402 100644
--- a/fxjs/xfa/cjx_instancemanager.h
+++ b/fxjs/xfa/cjx_instancemanager.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_INSTANCEMANAGER_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_InstanceManager;
 
diff --git a/fxjs/cjx_layoutpseudomodel.cpp b/fxjs/xfa/cjx_layoutpseudomodel.cpp
index ed43de58f4..b80000a0e2 100644
--- a/fxjs/cjx_layoutpseudomodel.cpp
+++ b/fxjs/xfa/cjx_layoutpseudomodel.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_layoutpseudomodel.h"
+#include "fxjs/xfa/cjx_layoutpseudomodel.h"
 
 #include <set>
 
diff --git a/fxjs/cjx_layoutpseudomodel.h b/fxjs/xfa/cjx_layoutpseudomodel.h
index e465d42f8e..63dc789190 100644
--- a/fxjs/cjx_layoutpseudomodel.h
+++ b/fxjs/xfa/cjx_layoutpseudomodel.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_LAYOUTPSEUDOMODEL_H_
-#define FXJS_CJX_LAYOUTPSEUDOMODEL_H_
+#ifndef FXJS_XFA_CJX_LAYOUTPSEUDOMODEL_H_
+#define FXJS_XFA_CJX_LAYOUTPSEUDOMODEL_H_
 
 #include <vector>
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 enum XFA_LAYOUTMODEL_HWXY {
   XFA_LAYOUTMODEL_H,
@@ -67,4 +67,4 @@ class CJX_LayoutPseudoModel : public CJX_Object {
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_LAYOUTPSEUDOMODEL_H_
+#endif  // FXJS_XFA_CJX_LAYOUTPSEUDOMODEL_H_
diff --git a/fxjs/xfa/cjx_list.h b/fxjs/xfa/cjx_list.h
index b4a002551a..45d827c21e 100644
--- a/fxjs/xfa/cjx_list.h
+++ b/fxjs/xfa/cjx_list.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_LIST_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CXFA_List;
 
diff --git a/fxjs/cjx_logpseudomodel.cpp b/fxjs/xfa/cjx_logpseudomodel.cpp
index 54713fa83d..e0ed05d0d1 100644
--- a/fxjs/cjx_logpseudomodel.cpp
+++ b/fxjs/xfa/cjx_logpseudomodel.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_logpseudomodel.h"
+#include "fxjs/xfa/cjx_logpseudomodel.h"
 
 #include <vector>
 
diff --git a/fxjs/cjx_logpseudomodel.h b/fxjs/xfa/cjx_logpseudomodel.h
index e22301e303..2d98241c5a 100644
--- a/fxjs/cjx_logpseudomodel.h
+++ b/fxjs/xfa/cjx_logpseudomodel.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_LOGPSEUDOMODEL_H_
-#define FXJS_CJX_LOGPSEUDOMODEL_H_
+#ifndef FXJS_XFA_CJX_LOGPSEUDOMODEL_H_
+#define FXJS_XFA_CJX_LOGPSEUDOMODEL_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CScript_LogPseudoModel;
 
@@ -27,4 +27,4 @@ class CJX_LogPseudoModel : public CJX_Object {
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_LOGPSEUDOMODEL_H_
+#endif  // FXJS_XFA_CJX_LOGPSEUDOMODEL_H_
diff --git a/fxjs/xfa/cjx_manifest.h b/fxjs/xfa/cjx_manifest.h
index 167ef46b6e..fd28e4065a 100644
--- a/fxjs/xfa/cjx_manifest.h
+++ b/fxjs/xfa/cjx_manifest.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_MANIFEST_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Manifest;
 
diff --git a/fxjs/xfa/cjx_model.h b/fxjs/xfa/cjx_model.h
index f4e6ac9406..17b8d3d6f5 100644
--- a/fxjs/xfa/cjx_model.h
+++ b/fxjs/xfa/cjx_model.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_MODEL_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Node;
 
diff --git a/fxjs/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp
index 1c476a2157..dd22fb4ca3 100644
--- a/fxjs/cjx_node.cpp
+++ b/fxjs/xfa/cjx_node.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 #include <map>
 #include <tuple>
diff --git a/fxjs/cjx_node.h b/fxjs/xfa/cjx_node.h
index 7ccf8b111b..a18166fbc9 100644
--- a/fxjs/cjx_node.h
+++ b/fxjs/xfa/cjx_node.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_NODE_H_
-#define FXJS_CJX_NODE_H_
+#ifndef FXJS_XFA_CJX_NODE_H_
+#define FXJS_XFA_CJX_NODE_H_
 
 #include <memory>
 #include <utility>
@@ -13,7 +13,7 @@
 
 #include "core/fxcrt/unowned_ptr.h"
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 #include "fxjs/xfa/cjx_tree.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
@@ -263,4 +263,4 @@ class CJX_Node : public CJX_Tree {
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_NODE_H_
+#endif  // FXJS_XFA_CJX_NODE_H_
diff --git a/fxjs/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
index fbbcc00365..81ba1ac3d2 100644
--- a/fxjs/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 #include <utility>
 
diff --git a/fxjs/cjx_object.h b/fxjs/xfa/cjx_object.h
index fb6251e224..cb8350d2b1 100644
--- a/fxjs/cjx_object.h
+++ b/fxjs/xfa/cjx_object.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_OBJECT_H_
-#define FXJS_CJX_OBJECT_H_
+#ifndef FXJS_XFA_CJX_OBJECT_H_
+#define FXJS_XFA_CJX_OBJECT_H_
 
 #include <map>
 #include <memory>
@@ -43,6 +43,7 @@ struct XFA_MAPDATABLOCKCALLBACKINFO {
 
 class CJX_Object {
  public:
+  explicit CJX_Object(CXFA_Object* obj);
   virtual ~CJX_Object();
 
   CXFA_Object* GetXFAObject() { return object_.Get(); }
@@ -115,8 +116,6 @@ class CJX_Object {
   void ThrowParamCountMismatchException(const WideString& method) const;
 
  protected:
-  explicit CJX_Object(CXFA_Object* obj);
-
   void DefineMethods(const CJX_MethodSpec method_specs[]);
 
   void MoveBufferMapData(CXFA_Object* pSrcModule, CXFA_Object* pDstModule);
@@ -161,4 +160,4 @@ class CJX_Object {
   std::map<ByteString, CJX_MethodCall> method_specs_;
 };
 
-#endif  // FXJS_CJX_OBJECT_H_
+#endif  // FXJS_XFA_CJX_OBJECT_H_
diff --git a/fxjs/xfa/cjx_packet.h b/fxjs/xfa/cjx_packet.h
index 80520e2751..b014a9d9ac 100644
--- a/fxjs/xfa/cjx_packet.h
+++ b/fxjs/xfa/cjx_packet.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_PACKET_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Packet;
 
diff --git a/fxjs/cjx_signaturepseudomodel.cpp b/fxjs/xfa/cjx_signaturepseudomodel.cpp
index 900116bccf..6b39ac2488 100644
--- a/fxjs/cjx_signaturepseudomodel.cpp
+++ b/fxjs/xfa/cjx_signaturepseudomodel.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cjx_signaturepseudomodel.h"
+#include "fxjs/xfa/cjx_signaturepseudomodel.h"
 
 #include <vector>
 
diff --git a/fxjs/cjx_signaturepseudomodel.h b/fxjs/xfa/cjx_signaturepseudomodel.h
index d0508dd694..88f90fb33a 100644
--- a/fxjs/cjx_signaturepseudomodel.h
+++ b/fxjs/xfa/cjx_signaturepseudomodel.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CJX_SIGNATUREPSEUDOMODEL_H_
-#define FXJS_CJX_SIGNATUREPSEUDOMODEL_H_
+#ifndef FXJS_XFA_CJX_SIGNATUREPSEUDOMODEL_H_
+#define FXJS_XFA_CJX_SIGNATUREPSEUDOMODEL_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CScript_SignaturePseudoModel;
 
@@ -26,4 +26,4 @@ class CJX_SignaturePseudoModel : public CJX_Object {
   static const CJX_MethodSpec MethodSpecs[];
 };
 
-#endif  // FXJS_CJX_SIGNATUREPSEUDOMODEL_H_
+#endif  // FXJS_XFA_CJX_SIGNATUREPSEUDOMODEL_H_
diff --git a/fxjs/xfa/cjx_source.h b/fxjs/xfa/cjx_source.h
index 1502e0e807..8b35fac428 100644
--- a/fxjs/xfa/cjx_source.h
+++ b/fxjs/xfa/cjx_source.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_SOURCE_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Source;
 
diff --git a/fxjs/xfa/cjx_textnode.h b/fxjs/xfa/cjx_textnode.h
index 1fa84d8d52..c0a01d651e 100644
--- a/fxjs/xfa/cjx_textnode.h
+++ b/fxjs/xfa/cjx_textnode.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_TEXTNODE_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_Node;
 
diff --git a/fxjs/xfa/cjx_tree.h b/fxjs/xfa/cjx_tree.h
index 30081122a5..72468d6c75 100644
--- a/fxjs/xfa/cjx_tree.h
+++ b/fxjs/xfa/cjx_tree.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_TREE_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 
 class CXFA_Object;
 class CXFA_Node;
diff --git a/fxjs/xfa/cjx_wsdlconnection.h b/fxjs/xfa/cjx_wsdlconnection.h
index 76533ce658..82760170a7 100644
--- a/fxjs/xfa/cjx_wsdlconnection.h
+++ b/fxjs/xfa/cjx_wsdlconnection.h
@@ -8,7 +8,7 @@
 #define FXJS_XFA_CJX_WSDLCONNECTION_H_
 
 #include "fxjs/CJX_Define.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 
 class CXFA_WsdlConnection;
 
diff --git a/xfa/fxfa/parser/cscript_datawindow.cpp b/xfa/fxfa/parser/cscript_datawindow.cpp
index 25ad589fe5..0bf17e54c0 100644
--- a/xfa/fxfa/parser/cscript_datawindow.cpp
+++ b/xfa/fxfa/parser/cscript_datawindow.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cscript_datawindow.h"
 
-#include "fxjs/cjx_datawindow.h"
+#include "fxjs/xfa/cjx_datawindow.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_localemgr.h"
diff --git a/xfa/fxfa/parser/cscript_datawindow.h b/xfa/fxfa/parser/cscript_datawindow.h
index fa29926845..819e8fe601 100644
--- a/xfa/fxfa/parser/cscript_datawindow.h
+++ b/xfa/fxfa/parser/cscript_datawindow.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_DATAWINDOW_H_
 #define XFA_FXFA_PARSER_CSCRIPT_DATAWINDOW_H_
 
-#include "fxjs/cjx_datawindow.h"
+#include "fxjs/xfa/cjx_datawindow.h"
 #include "xfa/fxfa/parser/cxfa_object.h"
 
 class CScript_DataWindow : public CXFA_Object {
diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
index 8f4e049a4f..da7fcb45b8 100644
--- a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cscript_eventpseudomodel.h"
 
-#include "fxjs/cjx_object.h"
+#include "fxjs/xfa/cjx_object.h"
 #include "third_party/base/ptr_util.h"
 
 CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument)
diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.h b/xfa/fxfa/parser/cscript_eventpseudomodel.h
index 991a538191..efb4df0188 100644
--- a/xfa/fxfa/parser/cscript_eventpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_eventpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_EVENTPSEUDOMODEL_H_
 #define XFA_FXFA_PARSER_CSCRIPT_EVENTPSEUDOMODEL_H_
 
-#include "fxjs/cjx_eventpseudomodel.h"
+#include "fxjs/xfa/cjx_eventpseudomodel.h"
 #include "xfa/fxfa/parser/cxfa_object.h"
 
 class CScript_EventPseudoModel : public CXFA_Object {
diff --git a/xfa/fxfa/parser/cscript_hostpseudomodel.h b/xfa/fxfa/parser/cscript_hostpseudomodel.h
index dc13056091..7e4a37d4d5 100644
--- a/xfa/fxfa/parser/cscript_hostpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_hostpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_HOSTPSEUDOMODEL_H_
 #define XFA_FXFA_PARSER_CSCRIPT_HOSTPSEUDOMODEL_H_
 
-#include "fxjs/cjx_hostpseudomodel.h"
+#include "fxjs/xfa/cjx_hostpseudomodel.h"
 #include "xfa/fxfa/parser/cxfa_object.h"
 
 class CXFA_Document;
diff --git a/xfa/fxfa/parser/cscript_layoutpseudomodel.h b/xfa/fxfa/parser/cscript_layoutpseudomodel.h
index 1662951e75..d76013a06c 100644
--- a/xfa/fxfa/parser/cscript_layoutpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_layoutpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_LAYOUTPSEUDOMODEL_H_
 #define XFA_FXFA_PARSER_CSCRIPT_LAYOUTPSEUDOMODEL_H_
 
-#include "fxjs/cjx_layoutpseudomodel.h"
+#include "fxjs/xfa/cjx_layoutpseudomodel.h"
 #include "xfa/fxfa/parser/cxfa_object.h"
 
 class CXFA_LayoutProcessor;
diff --git a/xfa/fxfa/parser/cscript_logpseudomodel.h b/xfa/fxfa/parser/cscript_logpseudomodel.h
index e6e7960597..9344f203b3 100644
--- a/xfa/fxfa/parser/cscript_logpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_logpseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_LOGPSEUDOMODEL_H_
 #define XFA_FXFA_PARSER_CSCRIPT_LOGPSEUDOMODEL_H_
 
-#include "fxjs/cjx_logpseudomodel.h"
+#include "fxjs/xfa/cjx_logpseudomodel.h"
 #include "xfa/fxfa/parser/cxfa_object.h"
 
 class CScript_LogPseudoModel : public CXFA_Object {
diff --git a/xfa/fxfa/parser/cscript_signaturepseudomodel.h b/xfa/fxfa/parser/cscript_signaturepseudomodel.h
index 31c80d86cb..276c1df4ab 100644
--- a/xfa/fxfa/parser/cscript_signaturepseudomodel.h
+++ b/xfa/fxfa/parser/cscript_signaturepseudomodel.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_PARSER_CSCRIPT_SIGNATUREPSEUDOMODEL_H_
 #define XFA_FXFA_PARSER_CSCRIPT_SIGNATUREPSEUDOMODEL_H_
 
-#include "fxjs/cjx_signaturepseudomodel.h"
+#include "fxjs/xfa/cjx_signaturepseudomodel.h"
 #include "xfa/fxfa/parser/cxfa_object.h"
 
 class CScript_SignaturePseudoModel : public CXFA_Object {
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h
index 9508daeec9..6079ea7f3f 100644
--- a/xfa/fxfa/parser/cxfa_node.h
+++ b/xfa/fxfa/parser/cxfa_node.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "core/fxcrt/fx_string.h"
-#include "fxjs/cjx_node.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/optional.h"
 #include "xfa/fxfa/parser/cxfa_object.h"
 
diff --git a/xfa/fxfa/parser/cxfa_thisproxy.cpp b/xfa/fxfa/parser/cxfa_thisproxy.cpp
index bbf88a86b7..314c98c9f0 100644
--- a/xfa/fxfa/parser/cxfa_thisproxy.cpp
+++ b/xfa/fxfa/parser/cxfa_thisproxy.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_thisproxy.h"
 
-#include "fxjs/cjx_thisproxy.h"
+#include "fxjs/xfa/cjx_object.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
 
@@ -15,7 +15,7 @@ CXFA_ThisProxy::CXFA_ThisProxy(CXFA_Node* pThisNode, CXFA_Node* pScriptNode)
                   XFA_ObjectType::VariablesThis,
                   XFA_Element::Unknown,
                   WideStringView(),
-                  pdfium::MakeUnique<CJX_ThisProxy>(this)),
+                  pdfium::MakeUnique<CJX_Object>(this)),
       m_pThisNode(pThisNode),
       m_pScriptNode(pScriptNode) {}
 
diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp
index 865bf8d1ef..1c3ec8ebf7 100644
--- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp
+++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp
@@ -6,13 +6,13 @@
 
 #include "xfa/fxfa/parser/xfa_basic_data.h"
 
-#include "fxjs/cjx_datawindow.h"
-#include "fxjs/cjx_eventpseudomodel.h"
-#include "fxjs/cjx_hostpseudomodel.h"
-#include "fxjs/cjx_layoutpseudomodel.h"
-#include "fxjs/cjx_logpseudomodel.h"
-#include "fxjs/cjx_node.h"
-#include "fxjs/cjx_signaturepseudomodel.h"
+#include "fxjs/xfa/cjx_datawindow.h"
+#include "fxjs/xfa/cjx_eventpseudomodel.h"
+#include "fxjs/xfa/cjx_hostpseudomodel.h"
+#include "fxjs/xfa/cjx_layoutpseudomodel.h"
+#include "fxjs/xfa/cjx_logpseudomodel.h"
+#include "fxjs/xfa/cjx_node.h"
+#include "fxjs/xfa/cjx_signaturepseudomodel.h"
 #include "fxjs/xfa/cjx_tree.h"
 #include "fxjs/xfa/cjx_treelist.h"
 #include "xfa/fxfa/fxfa_basic.h"