Revert of Remove CPDF_Object::Release() in favor of direct delete

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 "core/fpdfapi/parser/cpdf_stream.h"
@@ skipping 10 matching lines @@
 class CPDF_Dictionay;
 class CPDF_Document;
 class CPDF_Page;
 class IFX_Pause;
 class IFX_SeekableReadStream;
 class IFX_SeekableWriteStream;
 
 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, UniqueStream pStream);
   CPDF_Image(CPDF_Document* pDoc, uint32_t dwStreamObjNum);
   ~CPDF_Image();
 
   CPDF_Image* Clone();
 
   CPDF_Dictionary* GetInlineDict() const { return m_pDict; }
   CPDF_Stream* GetStream() const { return m_pStream; }
   CPDF_Dictionary* GetDict() const {
     return m_pStream ? m_pStream->GetDict() : nullptr;
   }
@@ skipping 35 matching lines @@
   void FinishInitialization();
   CPDF_Dictionary* InitJPEG(uint8_t* pData, uint32_t size);
 
   int32_t m_Height = 0;
   int32_t m_Width = 0;
   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;
+  UniqueStream m_pOwnedStream;
+  UniqueDictionary m_pOwnedDict;
   CPDF_Dictionary* m_pOC = nullptr;
 };
 
 #endif  // CORE_FPDFAPI_PAGE_CPDF_IMAGE_H_