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

base/allocator/allocator.gyp

Index: base/allocator/allocator.gyp
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 674d4d645f79a2b4a7de7d56589c4bacdb479e65..a493baec721e9d9d2261556959cb9b3d62ec06c2 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -55,6 +55,8 @@
           'sources': [
             'allocator_shim_win.cc',
             'allocator_shim_win.h',
+            'winheap_stubs_win.cc',
+            'winheap_stubs_win.h',
           ],
           'configurations': {
             'Debug_Base': {
@@ -387,6 +389,12 @@
         '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.