Use CFX_MaybeOwned<> in CPDF_Image

core/fpdfapi/page/cpdf_image.h

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FPDFAPI_PAGE_CPDF_IMAGE_H_
 #define CORE_FPDFAPI_PAGE_CPDF_IMAGE_H_
 
 #include <memory>
 
 #include "core/fpdfapi/parser/cpdf_stream.h"
+#include "core/fxcrt/cfx_maybe_owned.h"
 #include "core/fxcrt/fx_system.h"
 
 class CFX_DIBSource;
 class CFX_DIBitmap;
 class CPDF_Document;
 class CPDF_Page;
 class IFX_Pause;
 class IFX_SeekableReadStream;
 
 class CPDF_Image {
  public:
   explicit CPDF_Image(CPDF_Document* pDoc);
   CPDF_Image(CPDF_Document* pDoc, std::unique_ptr<CPDF_Stream> pStream);
   CPDF_Image(CPDF_Document* pDoc, uint32_t dwStreamObjNum);
   ~CPDF_Image();
 
   void ConvertStreamToIndirectObject();
 
-  CPDF_Dictionary* GetInlineDict() const { return m_pDict; }
-  CPDF_Stream* GetStream() const { return m_pStream; }
+  CPDF_Dictionary* GetInlineDict() const { return m_pDict.Get(); }
+  CPDF_Stream* GetStream() const { return m_pStream.Get(); }
   CPDF_Dictionary* GetDict() const {
     return m_pStream ? m_pStream->GetDict() : nullptr;
   }
   CPDF_Dictionary* GetOC() const { return m_pOC; }
   CPDF_Document* GetDocument() const { return m_pDocument; }
 
   int32_t GetPixelHeight() const { return m_Height; }
   int32_t GetPixelWidth() const { return m_Width; }
 
   bool IsInline() const { return m_bIsInline; }
@@ skipping 27 matching lines @@
  private:
   void FinishInitialization();
   std::unique_ptr<CPDF_Dictionary> InitJPEG(uint8_t* pData, uint32_t size);
 
   int32_t m_Height = 0;
   int32_t m_Width = 0;
   bool m_bIsInline = false;
   bool m_bIsMask = false;
   bool m_bInterpolate = false;
   CPDF_Document* const m_pDocument;
-  CPDF_Stream* m_pStream = nullptr;
-  CPDF_Dictionary* m_pDict = nullptr;
-  std::unique_ptr<CPDF_Stream> m_pOwnedStream;
-  std::unique_ptr<CPDF_Dictionary> m_pOwnedDict;
+  CFX_MaybeOwned<CPDF_Stream> m_pStream;
+  CFX_MaybeOwned<CPDF_Dictionary> m_pDict;
   CPDF_Dictionary* m_pOC = nullptr;
 };
 
 #endif  // CORE_FPDFAPI_PAGE_CPDF_IMAGE_H_