Enable some parts of base that were previously disabled in base_untrusted

base/base.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 191 matching lines @@
           ],
         }],
       ],
       'sources': [
         'third_party/nspr/prcpucfg.h',
         'third_party/nspr/prcpucfg_win.h',
         'third_party/nspr/prtypes.h',
         'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
         'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
         'auto_reset.h',
-        'base64.cc',
-        'base64.h',
         'event_recorder.h',
         'event_recorder_stubs.cc',
         'event_recorder_win.cc',
         'file_descriptor_shuffle.cc',
         'file_descriptor_shuffle.h',
         'linux_util.cc',
         'linux_util.h',
         'md5.cc',
         'md5.h',
         'message_pump_android.cc',
         'message_pump_android.h',
         'message_pump_glib.cc',
         'message_pump_glib.h',
         'message_pump_gtk.cc',
         'message_pump_gtk.h',
         'message_pump_observer.h',
         'message_pump_aurax11.cc',
         'message_pump_aurax11.h',
         'message_pump_libevent.cc',
         'message_pump_libevent.h',
         'message_pump_mac.h',
         'message_pump_mac.mm',
         'metrics/field_trial.cc',
         'metrics/field_trial.h',
-        'string16.cc',
-        'string16.h',
         'sync_socket.h',
         'sync_socket_win.cc',
         'sync_socket_posix.cc',
-        'time_mac.cc',
-        'time_posix.cc',
       ],
     },
     {
       'target_name': 'base_i18n',
       'type': '<(component)',
       'variables': {
         'enable_wexit_time_destructors': 1,
         'optimize': 'max',
       },
       'dependencies': [
@@ skipping 69 matching lines @@
       # TODO(rvargas): Remove this when gyp finally supports a clean model.
       # See bug 36232.
       'target_name': 'base_static_win64',
       'type': 'static_library',
       'sources': [
         'base_switches.cc',
         'base_switches.h',
         'win/pe_image.cc',
         'win/pe_image.h',
       ],
+      'sources!': [
+        # base64.cc depends on modp_b64.
+        'base64.cc',
+      ],
       'include_dirs': [
         '..',
       ],
       'configurations': {
         'Common_Base': {
           'msvs_target_platform': 'x64',
         },
       },
       'defines': [
         'NACL_WIN64',
@@ skipping 481 matching lines @@
           # TODO(gregoryd): direct_dependent_settings should be shared with the
           # 32-bit target, but it doesn't work due to a bug in gyp
           'direct_dependent_settings': {
             'include_dirs': [
               '..',
             ],
           },
           'defines': [
             '<@(nacl_win64_defines)',
           ],
+          'sources!': [
+            # base64.cc depends on modp_b64.
+            'base64.cc',
+          ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
           'conditions': [
             ['component == "shared_library"', {
               'sources!': [
                 'debug/debug_on_start_win.cc',
               ],
@@ skipping 158 matching lines @@
             'test_suite_name': 'base_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)base_unittests<(SHARED_LIB_SUFFIX)',
             'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }