Replace more CFX_MapPtrToPtr and remove it.

core/include/fpdfapi/fpdf_parser.h

 // Copyright 2014 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_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 
 #include <map>
@@ skipping 527 matching lines @@
 
   FX_BOOL m_bVersionUpdated;
 
   CPDF_Object* m_pLinearized;
 
   FX_DWORD m_dwFirstPageNo;
 
   FX_DWORD m_dwXrefStartObjNum;
 
   // A map of object numbers to indirect streams. Map owns the streams.
-  CFX_MapPtrToPtr m_ObjectStreamMap;
+  std::map<FX_DWORD, std::unique_ptr<CPDF_StreamAcc>> m_ObjectStreamMap;

[Oliver Chang, 2016/01/20 21:34:24]

awesome, we can do this now?

[Tom Sepez, 2016/01/20 22:18:30]

On 2016/01/20 21:34:24, Oliver Chang wrote:
Yes, ScopedVector is retired.

 
   // Mapping of object numbers to offsets. The offsets are relative to the first
   // object in the stream.
   using StreamObjectCache = std::map<FX_DWORD, FX_DWORD>;
 
   // Mapping of streams to their object caches. This is valid as long as the
   // streams in |m_ObjectStreamMap| are valid.
   std::map<CPDF_StreamAcc*, StreamObjectCache> m_ObjCache;
 
   // All indirect object numbers that are being parsed.
@@ skipping 438 matching lines @@
                        FX_DWORD src_size,
                        const CPDF_Dictionary* pDict,
                        uint8_t*& dest_buf,
                        FX_DWORD& dest_size,
                        CFX_ByteString& ImageEncoding,
                        CPDF_Dictionary*& pImageParms,
                        FX_DWORD estimated_size,
                        FX_BOOL bImageAcc);
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_