Remove CFX_PrivateData from CPDF_ModuleMgr

core/fpdfapi/include/cpdf_modulemgr.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_INCLUDE_CPDF_MODULEMGR_H_
 #define CORE_FPDFAPI_INCLUDE_CPDF_MODULEMGR_H_
 
 #include <memory>
 
 #include "core/fxcrt/include/fx_basic.h"
 
-class CCodec_ModuleMgr;
 class CCodec_FaxModule;
 class CCodec_FlateModule;
 class CCodec_IccModule;
 class CCodec_Jbig2Module;
 class CCodec_JpegModule;
 class CCodec_JpxModule;
-
+class CCodec_ModuleMgr;
 class CPDF_PageModule;
 
 class CPDF_ModuleMgr {
  public:
   static CPDF_ModuleMgr* Get();
   static void Create();
   static void Destroy();
   static const int kFileBufSize = 512;
 
   void SetCodecModule(CCodec_ModuleMgr* pModule) { m_pCodecModule = pModule; }
   CCodec_ModuleMgr* GetCodecModule() { return m_pCodecModule; }
 
   void InitPageModule();
+  CPDF_PageModule* GetPageModule() const { return m_pPageModule.get(); }
 
-  CPDF_PageModule* GetPageModule() const { return m_pPageModule.get(); }
+  // Takes ownership of |pAdapter|.

[Lei Zhang, 2016/05/24 21:34:58]

There's only 1 caller - change the param to a unique_ptr?

[Tom Sepez, 2016/05/24 21:56:55]

Done.

+  void SetUnsupportInfoAdapter(CFX_Deletable* pAdapter) {
+    m_pUnsupportInfoAdapter.reset(pAdapter);
+  }
+  CFX_Deletable* GetUnsupportInfoAdapter() const {
+    return m_pUnsupportInfoAdapter.get();
+  }
 
   void LoadEmbeddedGB1CMaps();
   void LoadEmbeddedCNS1CMaps();
   void LoadEmbeddedJapan1CMaps();
   void LoadEmbeddedKorea1CMaps();
 
   CCodec_FaxModule* GetFaxModule();
   CCodec_JpegModule* GetJpegModule();
   CCodec_JpxModule* GetJpxModule();
   CCodec_Jbig2Module* GetJbig2Module();
   CCodec_IccModule* GetIccModule();
   CCodec_FlateModule* GetFlateModule();
 
-  void SetPrivateData(void* module_id,
-                      void* pData,
-                      PD_CALLBACK_FREEDATA callback);
-
-  void* GetPrivateData(void* module_id);
-
  private:
   CPDF_ModuleMgr();
   ~CPDF_ModuleMgr();
 
   CCodec_ModuleMgr* m_pCodecModule;
   std::unique_ptr<CPDF_PageModule> m_pPageModule;
-  CFX_PrivateData m_privateData;
+  std::unique_ptr<CFX_Deletable> m_pUnsupportInfoAdapter;
 };
 
 #endif  // CORE_FPDFAPI_INCLUDE_CPDF_MODULEMGR_H_