Update from https://crrev.com/318214

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 170 matching lines @@
                   'setupapi.dll',
                 ],
                 'AdditionalDependencies': [
                   'cfgmgr32.lib',
                   'powrprof.lib',
                   'setupapi.lib',
                 ],
               },
             },
           },
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/',
+              'files': [
+                '../build/win/dbghelp_xp/dbghelp.dll',
+              ],
+            },
+          ],
         }],
         ['OS == "mac" or (OS == "ios" and _toolset == "host")', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
               '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
               '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
@@ skipping 437 matching lines @@
         'threading/worker_pool_posix_unittest.cc',
         'threading/worker_pool_unittest.cc',
         'time/pr_time_unittest.cc',
         'time/time_unittest.cc',
         'time/time_win_unittest.cc',
         'timer/hi_res_timer_manager_unittest.cc',
         'timer/mock_timer_unittest.cc',
         'timer/timer_unittest.cc',
         'tools_sanity_unittest.cc',
         'trace_event/memory_dump_manager_unittest.cc',
+        'trace_event/process_memory_maps_dump_provider_unittest.cc',
         'trace_event/process_memory_totals_dump_provider_unittest.cc',
         'trace_event/trace_event_argument_unittest.cc',
         'trace_event/trace_event_memory_unittest.cc',
         'trace_event/trace_event_synthetic_delay_unittest.cc',
         'trace_event/trace_event_system_stats_monitor_unittest.cc',
         'trace_event/trace_event_unittest.cc',
         'trace_event/trace_event_win_unittest.cc',
         'tracked_objects_unittest.cc',
         'tuple_unittest.cc',
         'values_unittest.cc',
@@ skipping 104 matching lines @@
             ],
           },
         ],
         ['OS == "win"', {
           'sources!': [
             'file_descriptor_shuffle_unittest.cc',
             'files/dir_reader_posix_unittest.cc',
             'message_loop/message_pump_libevent_unittest.cc',
             'threading/worker_pool_posix_unittest.cc',
           ],
+          'dependencies': [
+            'pe_image_test',
+          ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [
             4267,
           ],
           'conditions': [
             # This is needed so base_unittests uses the allocator shim, as
             # SecurityTest.MemoryAllocationRestriction* tests are dependent
             # on tcmalloc.
             # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
             # their own test suite.
@@ skipping 87 matching lines @@
     {
       # GN: //base/test:test_support
       'target_name': 'test_support_base',
       'type': 'static_library',
       'dependencies': [
         'base',
         'base_static',
         'base_i18n',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
       'export_dependent_settings': [
         'base',
       ],
       'conditions': [
         ['os_posix==0', {
           'sources!': [
             'test/scoped_locale.cc',
@@ skipping 641 matching lines @@
           'type': 'executable',
           'sources': [
             'debug_message.cc',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
             },
           },
         },
+        {
+          'target_name': 'pe_image_test',
+          'type': 'shared_library',
+          'sources': [
+            'win/pe_image_test.cc',
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
+              'DelayLoadDLLs': [
+                'cfgmgr32.dll',
+                'shell32.dll',
+              ],
+              'AdditionalDependencies': [
+                'cfgmgr32.lib',
+                'shell32.lib',
+              ],
+            },
+          },
+        },
       ],
     }],
     ['test_isolation_mode != "noop"', {
       'targets': [
         {
           'target_name': 'base_unittests_run',
           'type': 'none',
           'dependencies': [
             'base_unittests',
           ],
           'includes': [
             '../build/isolate.gypi',
           ],
           'sources': [
             'base_unittests.isolate',
           ],
           'conditions': [
             ['use_x11 == 1', {
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }