fxcrt convergence - XFA side.

pdfium.gyp

 {
   'variables': {
     'pdf_use_skia%': 0,
     'pdf_enable_v8%': 1,
     'pdf_enable_xfa%': 1,
     'conditions': [
       ['OS=="linux"', {
         'bundle_freetype%': 0,
       }, {  # On Android there's no system FreeType. On Windows and Mac, only a
             # few methods are used from it.
@@ skipping 754 matching lines @@
         'pdfium',
       ],
       'include_dirs': [
         '<(DEPTH)'
       ],
       'sources': [
         'core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp',
         'core/src/fxcrt/fx_basic_bstring_unittest.cpp',
         'core/src/fxcrt/fx_basic_memmgr_unittest.cpp',
         'core/src/fxcrt/fx_basic_wstring_unittest.cpp',
+        'core/src/fxcrt/fx_system_unittest.cpp',
+        'testing/fx_string_testhelpers.cpp',
         'testing/fx_string_testhelpers.h',
-        'testing/fx_string_testhelpers.cpp',
         'third_party/base/nonstd_unique_ptr_unittest.cpp',
       ],
       'conditions': [
         ['pdf_enable_xfa==1', {
           'sources': [
             'xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp',
             'xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp',
           ],
         }],
       ],
@@ skipping 37 matching lines @@
             '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform',
           ],
           'sources': [
             'fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp',
           ],
         }],
       ],
     },
   ],
 }