Remove CFX_MapPtrToPtr from xfa/fxfa.

xfa/fxfa/parser/cxfa_layoutpagemgr.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 XFA_FXFA_PARSER_CXFA_LAYOUTPAGEMGR_H_
 #define XFA_FXFA_PARSER_CXFA_LAYOUTPAGEMGR_H_
 
 #include <iterator>
 #include <list>
+#include <map>
 
 #include "xfa/fxfa/parser/xfa_layout_itemlayout.h"
 
 class CXFA_ContainerRecord;
 class CXFA_LayoutItem;
 
 class CXFA_LayoutPageMgr {
  public:
   explicit CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor);
   ~CXFA_LayoutPageMgr();
@@ skipping 90 matching lines @@
       bool bQuery = false,
       XFA_ATTRIBUTEENUM ePreferredPosition = XFA_ATTRIBUTEENUM_First);
   bool MatchPageAreaOddOrEven(CXFA_Node* pPageArea, bool bLastMatch);
   CXFA_Node* GetNextAvailPageArea(CXFA_Node* pTargetPageArea,
                                   CXFA_Node* pTargetContentArea = nullptr,
                                   bool bNewPage = false,
                                   bool bQuery = false);
   bool GetNextContentArea(CXFA_Node* pTargetContentArea);
   void InitPageSetMap();
   void ProcessLastPageSet();
-  inline bool IsPageSetRootOrderedOccurrence() {
+  bool IsPageSetRootOrderedOccurrence() const {
     return m_ePageSetMode == XFA_ATTRIBUTEENUM_OrderedOccurrence;
   }
   void ClearData();
   void MergePageSetContents();
   void LayoutPageSetContents();
   void PrepareLayout();
   void SaveLayoutItem(CXFA_LayoutItem* pParentLayoutItem);
+
   CXFA_LayoutProcessor* m_pLayoutProcessor;
   CXFA_Node* m_pTemplatePageSetRoot;
   CXFA_ContainerLayoutItem* m_pPageSetLayoutItemRoot;
   CXFA_ContainerLayoutItem* m_pPageSetCurRoot;
   std::list<CXFA_ContainerRecord*> m_ProposedContainerRecords;
   std::list<CXFA_ContainerRecord*>::iterator m_CurrentContainerRecordIter;
   CXFA_Node* m_pCurPageArea;
   int32_t m_nAvailPages;
   int32_t m_nCurPageCount;
   XFA_ATTRIBUTEENUM m_ePageSetMode;
   bool m_bCreateOverFlowPage;
-  CFX_MapPtrTemplate<CXFA_Node*, int32_t> m_pPageSetMap;
+  std::map<CXFA_Node*, int32_t> m_pPageSetMap;
   CFX_ArrayTemplate<CXFA_ContainerLayoutItem*> m_PageArray;
 };
 
 #endif  // XFA_FXFA_PARSER_CXFA_LAYOUTPAGEMGR_H_