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>
---
 fxjs/cfxjse_arguments.h | 4 ++--
 fxjs/cfxjse_class.h     | 6 +++---
 fxjs/cfxjse_context.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'fxjs')

diff --git a/fxjs/cfxjse_arguments.h b/fxjs/cfxjse_arguments.h
index 0553335535..92a36c842e 100644
--- a/fxjs/cfxjse_arguments.h
+++ b/fxjs/cfxjse_arguments.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "fxjs/cfxjse_class.h"
 #include "fxjs/fxjse.h"
 
@@ -31,7 +31,7 @@ class CFXJSE_Arguments {
 
  private:
   const v8::FunctionCallbackInfo<v8::Value>* m_pInfo;
-  CFX_UnownedPtr<CFXJSE_Value> m_pRetValue;
+  UnownedPtr<CFXJSE_Value> m_pRetValue;
 };
 
 #endif  // FXJS_CFXJSE_ARGUMENTS_H_
diff --git a/fxjs/cfxjse_class.h b/fxjs/cfxjse_class.h
index 01becfcf60..056525f30b 100644
--- a/fxjs/cfxjse_class.h
+++ b/fxjs/cfxjse_class.h
@@ -7,7 +7,7 @@
 #ifndef FXJS_CFXJSE_CLASS_H_
 #define FXJS_CFXJSE_CLASS_H_
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "fxjs/fxjse.h"
 #include "v8/include/v8.h"
 
@@ -33,8 +33,8 @@ class CFXJSE_Class {
 
  protected:
   ByteString m_szClassName;
-  CFX_UnownedPtr<const FXJSE_CLASS_DESCRIPTOR> m_lpClassDefinition;
-  CFX_UnownedPtr<CFXJSE_Context> m_pContext;
+  UnownedPtr<const FXJSE_CLASS_DESCRIPTOR> m_lpClassDefinition;
+  UnownedPtr<CFXJSE_Context> m_pContext;
   v8::Global<v8::FunctionTemplate> m_hTemplate;
   friend class CFXJSE_Context;
   friend class CFXJSE_Value;
diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp
index bef7597b52..ad6dbac0ad 100644
--- a/fxjs/cfxjse_context.cpp
+++ b/fxjs/cfxjse_context.cpp
@@ -68,7 +68,7 @@ class CFXJSE_ScopeUtil_IsolateHandleContext {
   void* operator new(size_t size) = delete;
   void operator delete(void*, size_t) = delete;
 
-  CFX_UnownedPtr<CFXJSE_Context> m_context;
+  UnownedPtr<CFXJSE_Context> m_context;
   CFXJSE_ScopeUtil_IsolateHandle m_parent;
   v8::Context::Scope m_cscope;
 };
-- 
cgit v1.2.3