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/fpdfdoc/cpdf_annot.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/fpdfdoc')

diff --git a/core/fpdfdoc/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h
index cf1b304670..cb579bbd3d 100644
--- a/core/fpdfdoc/cpdf_annot.h
+++ b/core/fpdfdoc/cpdf_annot.h
@@ -10,10 +10,10 @@
 #include <map>
 #include <memory>
 
-#include "core/fxcrt/cfx_maybe_owned.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/maybe_owned.h"
 
 class CFX_RenderDevice;
 class CPDF_Dictionary;
@@ -110,7 +110,7 @@ class CPDF_Annot {
 
   CFX_FloatRect RectForDrawing() const;
 
-  CFX_MaybeOwned<CPDF_Dictionary> m_pAnnotDict;
+  MaybeOwned<CPDF_Dictionary> m_pAnnotDict;
   CFX_UnownedPtr<CPDF_Document> const m_pDocument;
   CPDF_Annot::Subtype m_nSubtype;
   std::map<CPDF_Stream*, std::unique_ptr<CPDF_Form>> m_APMap;
-- 
cgit v1.2.3