From de44d154f6c61af75f149e965a7f483f0b30dd98 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 21 Sep 2017 14:52:41 -0400
Subject: Move CFX_MaybeOwned to fxcrt::MaybeOwned

This CL moves CFX_MaybeOwned into the fxcrt namespace and removes the
CFX_ prefix.

The test names for maybe owned were updated to be in the MaybeOned test
suite instead of the fxcrt suite.

Bug: pdfium:898
Change-Id: I0c07057d66c8610e7b19133094b4507fff725e76
Reviewed-on: https://pdfium-review.googlesource.com/14470
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
 core/fpdfapi/parser/cpdf_object_avail.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/fpdfapi/parser/cpdf_object_avail.h')

diff --git a/core/fpdfapi/parser/cpdf_object_avail.h b/core/fpdfapi/parser/cpdf_object_avail.h
index 233d180c94..bd46cdba5c 100644
--- a/core/fpdfapi/parser/cpdf_object_avail.h
+++ b/core/fpdfapi/parser/cpdf_object_avail.h
@@ -10,8 +10,8 @@
 #include <stack>
 
 #include "core/fpdfapi/parser/cpdf_data_avail.h"
-#include "core/fxcrt/cfx_maybe_owned.h"
 #include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/maybe_owned.h"
 
 class CPDF_Object;
 class CPDF_Reference;
@@ -44,7 +44,7 @@ class CPDF_ObjectAvail {
 
   CFX_UnownedPtr<CPDF_ReadValidator> validator_;
   CFX_UnownedPtr<CPDF_IndirectObjectHolder> holder_;
-  CFX_MaybeOwned<const CPDF_Object> root_;
+  MaybeOwned<const CPDF_Object> root_;
   std::set<uint32_t> parsed_objnums_;
   std::stack<uint32_t> non_parsed_objects_;
 };
-- 
cgit v1.2.3