Rename CFX_RetainPtr to RetainPtr

This CL renames CFX_RetainPtr to RetainPtr and places in the fxcrt
namespace.

Bug: pdfium:898
Change-Id: I8798a9f79cb0840d3f037e8d04937cedd742914e
Reviewed-on: https://pdfium-review.googlesource.com/14616
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

9 files changed, 19 insertions, 20 deletions

diff --git a/xfa/fxfa/parser/cxfa_dataexporter.cpp b/xfa/fxfa/parser/cxfa_dataexporter.cpp
index edc7b23b6b..b0de057e2a 100644
--- a/xfa/fxfa/parser/cxfa_dataexporter.cpp
+++ b/xfa/fxfa/parser/cxfa_dataexporter.cpp
@@ -328,7 +328,7 @@ void RegenerateFormFile_Changed(CXFA_Node* pNode,
 
 void RegenerateFormFile_Container(
     CXFA_Node* pNode,
-    const CFX_RetainPtr<CFX_SeekableStreamProxy>& pStream,
+    const RetainPtr<CFX_SeekableStreamProxy>& pStream,
     bool bSaveXML) {
   XFA_Element eType = pNode->GetElementType();
   if (eType == XFA_Element::Field || eType == XFA_Element::Draw ||
@@ -385,7 +385,7 @@ void RegenerateFormFile_Container(
 
 void XFA_DataExporter_RegenerateFormFile(
     CXFA_Node* pNode,
-    const CFX_RetainPtr<CFX_SeekableStreamProxy>& pStream,
+    const RetainPtr<CFX_SeekableStreamProxy>& pStream,
     const char* pChecksum,
     bool bSaveXML) {
   if (pNode->IsModelNode()) {
@@ -460,12 +460,11 @@ CXFA_DataExporter::CXFA_DataExporter(CXFA_Document* pDocument)
 
 CXFA_DataExporter::~CXFA_DataExporter() {}
 
-bool CXFA_DataExporter::Export(
-    const CFX_RetainPtr<IFX_SeekableStream>& pWrite) {
+bool CXFA_DataExporter::Export(const RetainPtr<IFX_SeekableStream>& pWrite) {
   return Export(pWrite, m_pDocument->GetRoot(), 0, nullptr);
 }
 
-bool CXFA_DataExporter::Export(const CFX_RetainPtr<IFX_SeekableStream>& pWrite,
+bool CXFA_DataExporter::Export(const RetainPtr<IFX_SeekableStream>& pWrite,
                                CXFA_Node* pNode,
                                uint32_t dwFlag,
                                const char* pChecksum) {
@@ -479,7 +478,7 @@ bool CXFA_DataExporter::Export(const CFX_RetainPtr<IFX_SeekableStream>& pWrite,
 }
 
 bool CXFA_DataExporter::Export(
-    const CFX_RetainPtr<CFX_SeekableStreamProxy>& pStream,
+    const RetainPtr<CFX_SeekableStreamProxy>& pStream,
     CXFA_Node* pNode,
     uint32_t dwFlag,
     const char* pChecksum) {
diff --git a/xfa/fxfa/parser/cxfa_dataexporter.h b/xfa/fxfa/parser/cxfa_dataexporter.h
index 4c0d90af9e..0820560c87 100644
--- a/xfa/fxfa/parser/cxfa_dataexporter.h
+++ b/xfa/fxfa/parser/cxfa_dataexporter.h
@@ -7,8 +7,8 @@
 #ifndef XFA_FXFA_PARSER_CXFA_DATAEXPORTER_H_
 #define XFA_FXFA_PARSER_CXFA_DATAEXPORTER_H_
 
-#include "core/fxcrt/cfx_retain_ptr.h"
 #include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/retain_ptr.h"
 
 class CXFA_Document;
 class CXFA_Node;
@@ -20,14 +20,14 @@ class CXFA_DataExporter {
   explicit CXFA_DataExporter(CXFA_Document* pDocument);
   ~CXFA_DataExporter();
 
-  bool Export(const CFX_RetainPtr<IFX_SeekableStream>& pWrite);
-  bool Export(const CFX_RetainPtr<IFX_SeekableStream>& pWrite,
+  bool Export(const RetainPtr<IFX_SeekableStream>& pWrite);
+  bool Export(const RetainPtr<IFX_SeekableStream>& pWrite,
               CXFA_Node* pNode,
               uint32_t dwFlag,
               const char* pChecksum);
 
  private:
-  bool Export(const CFX_RetainPtr<CFX_SeekableStreamProxy>& pStream,
+  bool Export(const RetainPtr<CFX_SeekableStreamProxy>& pStream,
               CXFA_Node* pNode,
               uint32_t dwFlag,
               const char* pChecksum);
diff --git a/xfa/fxfa/parser/cxfa_dataimporter.cpp b/xfa/fxfa/parser/cxfa_dataimporter.cpp
index e4ae3d0796..ab18f6182d 100644
--- a/xfa/fxfa/parser/cxfa_dataimporter.cpp
+++ b/xfa/fxfa/parser/cxfa_dataimporter.cpp
@@ -25,7 +25,7 @@ CXFA_DataImporter::CXFA_DataImporter(CXFA_Document* pDocument)
 CXFA_DataImporter::~CXFA_DataImporter() {}
 
 bool CXFA_DataImporter::ImportData(
-    const CFX_RetainPtr<IFX_SeekableStream>& pDataDocument) {
+    const RetainPtr<IFX_SeekableStream>& pDataDocument) {
   auto pDataDocumentParser =
       pdfium::MakeUnique<CXFA_SimpleParser>(m_pDocument.Get(), false);
   if (pDataDocumentParser->StartParse(pDataDocument, XFA_XDPPACKET_Datasets) !=
diff --git a/xfa/fxfa/parser/cxfa_dataimporter.h b/xfa/fxfa/parser/cxfa_dataimporter.h
index d3af1de517..dc7764ccad 100644
--- a/xfa/fxfa/parser/cxfa_dataimporter.h
+++ b/xfa/fxfa/parser/cxfa_dataimporter.h
@@ -7,9 +7,9 @@
 #ifndef XFA_FXFA_PARSER_CXFA_DATAIMPORTER_H_
 #define XFA_FXFA_PARSER_CXFA_DATAIMPORTER_H_
 
-#include "core/fxcrt/cfx_retain_ptr.h"
 #include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/retain_ptr.h"
 
 class CXFA_Document;
 class IFX_SeekableStream;
@@ -19,7 +19,7 @@ class CXFA_DataImporter {
   explicit CXFA_DataImporter(CXFA_Document* pDocument);
   ~CXFA_DataImporter();
 
-  bool ImportData(const CFX_RetainPtr<IFX_SeekableStream>& pDataDocument);
+  bool ImportData(const RetainPtr<IFX_SeekableStream>& pDataDocument);
 
  private:
   CFX_UnownedPtr<CXFA_Document> const m_pDocument;
diff --git a/xfa/fxfa/parser/cxfa_document_parser.cpp b/xfa/fxfa/parser/cxfa_document_parser.cpp
index 99b36749d1..b8ff8f860c 100644
--- a/xfa/fxfa/parser/cxfa_document_parser.cpp
+++ b/xfa/fxfa/parser/cxfa_document_parser.cpp
@@ -18,7 +18,7 @@ CXFA_DocumentParser::~CXFA_DocumentParser() {
 }
 
 int32_t CXFA_DocumentParser::StartParse(
-    const CFX_RetainPtr<IFX_SeekableStream>& pStream,
+    const RetainPtr<IFX_SeekableStream>& pStream,
     XFA_XDPPACKET ePacketID) {
   m_pDocument.reset();
   m_nodeParser.CloseParser();
diff --git a/xfa/fxfa/parser/cxfa_document_parser.h b/xfa/fxfa/parser/cxfa_document_parser.h
index ad3f17f8e8..e788480751 100644
--- a/xfa/fxfa/parser/cxfa_document_parser.h
+++ b/xfa/fxfa/parser/cxfa_document_parser.h
@@ -22,7 +22,7 @@ class CXFA_DocumentParser {
   explicit CXFA_DocumentParser(CXFA_FFNotify* pNotify);
   ~CXFA_DocumentParser();
 
-  int32_t StartParse(const CFX_RetainPtr<IFX_SeekableStream>& pStream,
+  int32_t StartParse(const RetainPtr<IFX_SeekableStream>& pStream,
                      XFA_XDPPACKET ePacketID);
   int32_t DoParse();
 
diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp
index 5b58761712..4574ae48d7 100644
--- a/xfa/fxfa/parser/cxfa_simple_parser.cpp
+++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp
@@ -273,7 +273,7 @@ void CXFA_SimpleParser::SetFactory(CXFA_Document* pFactory) {
 }
 
 int32_t CXFA_SimpleParser::StartParse(
-    const CFX_RetainPtr<IFX_SeekableStream>& pStream,
+    const RetainPtr<IFX_SeekableStream>& pStream,
     XFA_XDPPACKET ePacketID) {
   CloseParser();
   m_pFileRead = pStream;
diff --git a/xfa/fxfa/parser/cxfa_simple_parser.h b/xfa/fxfa/parser/cxfa_simple_parser.h
index 91bfb054b5..00250e7257 100644
--- a/xfa/fxfa/parser/cxfa_simple_parser.h
+++ b/xfa/fxfa/parser/cxfa_simple_parser.h
@@ -25,7 +25,7 @@ class CXFA_SimpleParser {
   CXFA_SimpleParser(CXFA_Document* pFactory, bool bDocumentParser);
   ~CXFA_SimpleParser();
 
-  int32_t StartParse(const CFX_RetainPtr<IFX_SeekableStream>& pStream,
+  int32_t StartParse(const RetainPtr<IFX_SeekableStream>& pStream,
                      XFA_XDPPACKET ePacketID);
   int32_t DoParse();
   CFX_XMLNode* ParseXMLData(const ByteString& wsXML);
@@ -77,8 +77,8 @@ class CXFA_SimpleParser {
 
   CFX_XMLParser* m_pXMLParser;
   std::unique_ptr<CFX_XMLDoc> m_pXMLDoc;
-  CFX_RetainPtr<CFX_SeekableStreamProxy> m_pStream;
-  CFX_RetainPtr<IFX_SeekableStream> m_pFileRead;
+  RetainPtr<CFX_SeekableStreamProxy> m_pStream;
+  RetainPtr<IFX_SeekableStream> m_pFileRead;
   CXFA_Document* m_pFactory;
   CXFA_Node* m_pRootNode;
   XFA_XDPPACKET m_ePacketID;
diff --git a/xfa/fxfa/parser/xfa_utils.h b/xfa/fxfa/parser/xfa_utils.h
index 404586bd56..b6839ef708 100644
--- a/xfa/fxfa/parser/xfa_utils.h
+++ b/xfa/fxfa/parser/xfa_utils.h
@@ -155,7 +155,7 @@ bool XFA_FieldIsMultiListBox(CXFA_Node* pFieldNode);
 void XFA_DataExporter_DealWithDataGroupNode(CXFA_Node* pDataNode);
 void XFA_DataExporter_RegenerateFormFile(
     CXFA_Node* pNode,
-    const CFX_RetainPtr<CFX_SeekableStreamProxy>& pStream,
+    const RetainPtr<CFX_SeekableStreamProxy>& pStream,
     const char* pChecksum = nullptr,
     bool bSaveXML = false);