Merge to XFA: Replace more CFX_MapPtrToPtr.

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 88619bd536f1abc6da6e76ec69275c477106f6c4..e0cc2b5b4ddadc29c2b1f9b441489eff4be1bc2b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -481,7 +481,6 @@ static_library("fxcrt") {
     "core/src/fxcrt/fx_basic_coords.cpp",
     "core/src/fxcrt/fx_basic_gcc.cpp",
     "core/src/fxcrt/fx_basic_list.cpp",
-    "core/src/fxcrt/fx_basic_maps.cpp",
     "core/src/fxcrt/fx_basic_memmgr.cpp",
     "core/src/fxcrt/fx_basic_plex.cpp",
     "core/src/fxcrt/fx_basic_utf.cpp",
@@ -507,6 +506,7 @@ static_library("fxcrt") {
       "core/include/fxcrt/fx_arb.h",
       "core/src/fxcrt/fx_arabic.cpp",
       "core/src/fxcrt/fx_arabic.h",
+      "core/src/fxcrt/fx_basic_maps.cpp",
     ]
   }
   configs += [ ":pdfium_config" ]