Start refactoring Windows allocator shim in prep for hooking in generic allocator shim on Windows.

base/allocator/allocator.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.
 
 {
   'target_defaults': {
     'variables': {
       # This code gets run a lot and debugged rarely, so it should be fast
       # by default. See http://crbug.com/388949.
       'debug_optimize': '2',
@@ skipping 37 matching lines @@
             'VCLinkerTool': {
               'AdditionalOptions': ['/ignore:4006'],
             },
           },
           'include_dirs': [
             '../..',
           ],
           'sources': [
             'allocator_shim_win.cc',
             'allocator_shim_win.h',
+            'winheap_stubs_win.cc',
+            'winheap_stubs_win.h',
           ],
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'RuntimeLibrary': '0',
                 },
               },
             },
           },
@@ skipping 312 matching lines @@
       # GN: //base/allocator:features
       # When referenced from a target that might be compiled in the host
       # toolchain, always refer to 'allocator_features#target'.
       'target_name': 'allocator_features',
       'includes': [ '../../build/buildflag_header.gypi' ],
       'variables': {
         'buildflag_header_path': 'base/allocator/features.h',
         'buildflag_flags': [
           'USE_EXPERIMENTAL_ALLOCATOR_SHIM=<(use_experimental_allocator_shim)',
         ],
+        'conditions': [

[Sigurður Ásgeirsson, 2016/07/18 13:42:04]

This is a little less eye-bleed ugly - thanks!

I've verified that this turns on the OOM unittests under GYP on non-component
builds.

+            ['<(use_experimental_allocator_shim) or <(win_use_allocator_shim)',
+             {'buildflag_flags': [ 'ENABLE_WIN_ALLOCATOR_SHIM_TESTS=1' ],},
+             {'buildflag_flags': [ 'ENABLE_WIN_ALLOCATOR_SHIM_TESTS=0' ],}
+           ],
+        ],
       },
     },  # 'allocator_features' target.
   ],  # targets.
   'conditions': [
     ['use_experimental_allocator_shim==1', {
       'targets': [
         {
           # GN: //base/allocator:unified_allocator_shim
           'target_name': 'unified_allocator_shim',
           'toolsets': ['host', 'target'],
@@ skipping 41 matching lines @@
                   '-Wl,-wrap,valloc',
                 ],
               },
             }],
           ]
         },  # 'unified_allocator_shim' target.
       ],
     }]
   ],
 }