Clean up singleton implementation

core/fpdfapi/include/cpdf_modulemgr.h

Index: core/fpdfapi/include/cpdf_modulemgr.h
diff --git a/core/fpdfapi/include/cpdf_modulemgr.h b/core/fpdfapi/include/cpdf_modulemgr.h
index 95c5385e641841205b5f2d50bf04ba9e71cc3178..8f88455a67d0c28e2ac768fd1b842f53fe07fcc6 100644
--- a/core/fpdfapi/include/cpdf_modulemgr.h
+++ b/core/fpdfapi/include/cpdf_modulemgr.h
@@ -56,6 +56,8 @@ class CPDF_ModuleMgr {
   CPDF_ModuleMgr();
   ~CPDF_ModuleMgr();
 
+  static CPDF_ModuleMgr* m_pDefaultMgr;

[Lei Zhang, 2016/07/16 01:23:03]

Leave it as a global, for the same reason as CPDFXFA_App.

[Wei Li, 2016/07/18 19:07:07]

Not sure which style to follow as both g_ and s_ were used. Let's go with s_ to
be different from global variables.

[Lei Zhang, 2016/07/18 19:35:00]

Sorry if I was unclear. What I was trying to say is this pointer can be declared
in the .cpp file as a global in an anonymous namespace. Doesn't need to be in
the header.

+
   CCodec_ModuleMgr* m_pCodecModule;
   std::unique_ptr<CPDF_PageModule> m_pPageModule;
   std::unique_ptr<CFX_Deletable> m_pUnsupportInfoAdapter;