From aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 21 Sep 2017 16:53:58 -0400
Subject: Move CFX_UnownedPtr to UnownedPtr

This CL moves CFX_UnownedPtr to UnownedPtr and places in the fxcrt
namespace.

Bug: pdfium:898
Change-Id: I6d1fa463f365e5cb3aafa8c8a7a5f7eff62ed8e0
Reviewed-on: https://pdfium-review.googlesource.com/14620
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 core/fpdfapi/edit/cpdf_creator.h              | 10 +++++-----
 core/fpdfapi/edit/cpdf_pagecontentgenerator.h |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'core/fpdfapi/edit')

diff --git a/core/fpdfapi/edit/cpdf_creator.h b/core/fpdfapi/edit/cpdf_creator.h
index 3ea5da85b7..e8fe18f87d 100644
--- a/core/fpdfapi/edit/cpdf_creator.h
+++ b/core/fpdfapi/edit/cpdf_creator.h
@@ -11,9 +11,9 @@
 #include <memory>
 #include <vector>
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_stream.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 
 class CPDF_Array;
 class CPDF_CryptoHandler;
@@ -80,13 +80,13 @@ class CPDF_Creator {
 
   bool IsXRefNeedEnd();
 
-  CFX_UnownedPtr<CPDF_Document> const m_pDocument;
-  CFX_UnownedPtr<CPDF_Parser> const m_pParser;
+  UnownedPtr<CPDF_Document> const m_pDocument;
+  UnownedPtr<CPDF_Parser> const m_pParser;
   bool m_bSecurityChanged;
-  CFX_UnownedPtr<CPDF_Dictionary> m_pEncryptDict;
+  UnownedPtr<CPDF_Dictionary> m_pEncryptDict;
   uint32_t m_dwEncryptObjNum;
   RetainPtr<CPDF_CryptoHandler> m_pCryptoHandler;
-  CFX_UnownedPtr<CPDF_Object> m_pMetadata;
+  UnownedPtr<CPDF_Object> m_pMetadata;
   uint32_t m_dwLastObjNum;
   std::unique_ptr<IFX_ArchiveStream> m_Archive;
   FX_FILESIZE m_SavedOffset;
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.h b/core/fpdfapi/edit/cpdf_pagecontentgenerator.h
index 433ad3361a..efc5739c4b 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.h
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.h
@@ -10,9 +10,9 @@
 #include <sstream>
 #include <vector>
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
 
 class CPDF_Document;
 class CPDF_ImageObject;
@@ -40,9 +40,9 @@ class CPDF_PageContentGenerator {
   ByteString RealizeResource(uint32_t dwResourceObjNum,
                              const ByteString& bsType);
 
-  CFX_UnownedPtr<CPDF_PageObjectHolder> const m_pObjHolder;
-  CFX_UnownedPtr<CPDF_Document> const m_pDocument;
-  std::vector<CFX_UnownedPtr<CPDF_PageObject>> m_pageObjects;
+  UnownedPtr<CPDF_PageObjectHolder> const m_pObjHolder;
+  UnownedPtr<CPDF_Document> const m_pDocument;
+  std::vector<UnownedPtr<CPDF_PageObject>> m_pageObjects;
 };
 
 #endif  // CORE_FPDFAPI_EDIT_CPDF_PAGECONTENTGENERATOR_H_
-- 
cgit v1.2.3