Fold CXFA_ExDataData into CXFA_ExData

This CL removes the CXFA_ExDataData wrapper and puts the code in
CXFA_ExData directly.

Change-Id: I9406d615a09fb431b5c620ed348f9976cf8dc72a
Reviewed-on: https://pdfium-review.googlesource.com/22230
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index c98597f78e..8de905278e 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -18,6 +18,7 @@
 #include "xfa/fxfa/parser/cxfa_bind.h"
 #include "xfa/fxfa/parser/cxfa_datagroup.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
+#include "xfa/fxfa/parser/cxfa_exdata.h"
 #include "xfa/fxfa/parser/cxfa_form.h"
 #include "xfa/fxfa/parser/cxfa_image.h"
 #include "xfa/fxfa/parser/cxfa_items.h"
@@ -326,11 +327,10 @@ void CreateDataBinding(CXFA_Node* pFormNode,
 
             wsNormalizeValue += wsItem;
           }
-          CXFA_ExDataData exData =
-              defValue ? defValue->GetExData() : CXFA_ExDataData(nullptr);
-          ASSERT(exData.HasValidNode());
+          CXFA_ExData* exData = defValue ? defValue->GetExData() : nullptr;
+          ASSERT(exData);
 
-          exData.SetContentType(single ? L"text/plain" : L"text/xml");
+          exData->SetContentType(single ? L"text/plain" : L"text/xml");
         }
         FormValueNode_SetChildContent(defValue, wsNormalizeValue,
                                       XFA_Element::ExData);