Revert "Update CPDF_IndirectObjectHolder APIs for unique objects."

fpdfsdk/cpdfsdk_baannot.cpp

 // 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
 
 #include "fpdfsdk/cpdfsdk_baannot.h"
 
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_document.h"
@@ skipping 298 matching lines @@
     if (!pAPTypeDict) {
       pAPTypeDict =
           new CPDF_Dictionary(m_pAnnot->GetDocument()->GetByteStringPool());
       pAPDict->SetFor(sAPType, pAPTypeDict);
     }
     pParentDict = pAPTypeDict;
     pStream = pAPTypeDict->GetStreamFor(sAPState);
   }
 
   if (!pStream) {
+    pStream = new CPDF_Stream;
     CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
-    pStream = pDoc->AddIndirectStream();
-    pParentDict->SetReferenceFor(sAPType, pDoc, pStream);
+    pParentDict->SetReferenceFor(sAPType, pDoc,
+                                 pDoc->AddIndirectObject(pStream));
   }
 
   CPDF_Dictionary* pStreamDict = pStream->GetDict();
   if (!pStreamDict) {
     pStreamDict =
         new CPDF_Dictionary(m_pAnnot->GetDocument()->GetByteStringPool());
     pStreamDict->SetNameFor("Type", "XObject");
     pStreamDict->SetNameFor("Subtype", "Form");
     pStreamDict->SetIntegerFor("FormType", 1);
     pStream->InitStream(nullptr, 0, pStreamDict);
@@ skipping 14 matching lines @@
 }
 
 CPDF_Action CPDFSDK_BAAnnot::GetAction() const {
   return CPDF_Action(m_pAnnot->GetAnnotDict()->GetDictFor("A"));
 }
 
 void CPDFSDK_BAAnnot::SetAction(const CPDF_Action& action) {
   CPDF_Dictionary* pDict = action.GetDict();
   if (pDict != m_pAnnot->GetAnnotDict()->GetDictFor("A")) {
     CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
-
-    // TODO(tsepez): check |pDict| ownership.
-    m_pAnnot->GetAnnotDict()->SetReferenceFor(
-        "A", pDoc, pDoc->AddIndirectObject(UniqueDictionary(pDict)));
+    m_pAnnot->GetAnnotDict()->SetReferenceFor("A", pDoc,
+                                              pDoc->AddIndirectObject(pDict));
   }
 }
 
 void CPDFSDK_BAAnnot::RemoveAction() {
   m_pAnnot->GetAnnotDict()->RemoveFor("A");
 }
 
 CPDF_AAction CPDFSDK_BAAnnot::GetAAction() const {
   return CPDF_AAction(m_pAnnot->GetAnnotDict()->GetDictFor("AA"));
 }
@@ skipping 24 matching lines @@
                                    CPDF_RenderOptions* pOptions) {
   m_pAnnot->GetAPForm(m_pPageView->GetPDFPage(), CPDF_Annot::Normal);
   m_pAnnot->DrawAppearance(m_pPageView->GetPDFPage(), pDevice, pUser2Device,
                            CPDF_Annot::Normal, nullptr);
 }
 
 void CPDFSDK_BAAnnot::SetOpenState(bool bOpenState) {
   if (CPDF_Annot* pAnnot = m_pAnnot->GetPopupAnnot())
     pAnnot->SetOpenState(bOpenState);
 }