Remove CFX_PrivateData from CPDF_ModuleMgr

pdfium.gyp

Index: pdfium.gyp
diff --git a/pdfium.gyp b/pdfium.gyp
index 3a3bf69f422b720b8ab88d03a3ed293e2471003d..ae30a3c1e539a39c050a5b9cd31f305c7cfb8f82 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -262,7 +262,7 @@
       'target_name': 'fpdfapi',
       'type': 'static_library',
       'sources': [
-        'core/fpdfapi/fpdf_basic_module.cpp',
+        'core/fpdfapi/cpdf_modulemgr.cpp',
         'core/fpdfapi/fpdf_cmaps/cmap_int.h',
         'core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp',
         'core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp',
@@ -326,8 +326,8 @@
         'core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp',
-        'core/fpdfapi/fpdf_edit/editint.h',
         'core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp',
+        'core/fpdfapi/fpdf_edit/editint.h',
         'core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp',
         'core/fpdfapi/fpdf_edit/include/cpdf_creator.h',
         'core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h',
@@ -382,8 +382,8 @@
         'core/fpdfapi/fpdf_page/cpdf_meshstream.cpp',
         'core/fpdfapi/fpdf_page/cpdf_meshstream.h',
         'core/fpdfapi/fpdf_page/cpdf_page.cpp',
-        "core/fpdfapi/fpdf_page/cpdf_pagemodule.cpp",
-        "core/fpdfapi/fpdf_page/cpdf_pagemodule.h",
+        'core/fpdfapi/fpdf_page/cpdf_pagemodule.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_pagemodule.h',
         'core/fpdfapi/fpdf_page/cpdf_pageobject.cpp',
         'core/fpdfapi/fpdf_page/cpdf_pageobjectholder.cpp',
         'core/fpdfapi/fpdf_page/cpdf_pageobjectlist.cpp',
@@ -476,9 +476,9 @@
         'core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp',
         'core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp',
         'core/fpdfapi/fpdf_render/fpdf_render_text.cpp',
-        'core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h',
-        'core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h',
         'core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h',
+        'core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h',
+        'core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h',
         'core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h',
         'core/fpdfapi/fpdf_render/render_int.h',
         'core/fpdfapi/include/cpdf_modulemgr.h',