Revert of Allocator shims working on VS2015.

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 31 matching lines @@
         ['OS=="win" and win_use_allocator_shim==1', {
           'msvs_settings': {
             # TODO(sgk):  merge this with build/common.gypi settings
             'VCLibrarianTool': {
               'AdditionalOptions': ['/ignore:4006,4221'],
             },
             'VCLinkerTool': {
               'AdditionalOptions': ['/ignore:4006'],
             },
           },
+          'dependencies': [
+            'libcmt',
+          ],
           'include_dirs': [
             '../..',
           ],
           'sources': [
             'allocator_shim_win.cc',
-            'allocator_shim_win.h',
           ],
+          'link_settings': {
+            'msvs_settings': {
+              'VCLinkerTool': {
+                'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
+                'AdditionalDependencies': [
+                  '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib'
+                ],
+              },
+            },
+          },
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'RuntimeLibrary': '0',
                 },
               },
             },
           },
         }],  # OS=="win"
@@ skipping 305 matching lines @@
       'includes': [ '../../build/buildflag_header.gypi' ],
       'variables': {
         'buildflag_header_path': 'base/allocator/features.h',
         'buildflag_flags': [
           'USE_EXPERIMENTAL_ALLOCATOR_SHIM=<(use_experimental_allocator_shim)',
         ],
       },
     },  # 'allocator_features' target.
   ],  # targets.
   'conditions': [
+    ['OS=="win" and win_use_allocator_shim==1', {
+      'targets': [
+        {
+          'target_name': 'libcmt',
+          'toolsets': ['host', 'target'],
+          'type': 'none',
+          'actions': [
+            {
+              'action_name': 'libcmt',
+              'inputs': [
+                'prep_libc.py',
+              ],
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib',
+              ],
+              'action': [
+                'python',
+                'prep_libc.py',
+                '$(VCInstallDir)lib',
+                '<(SHARED_INTERMEDIATE_DIR)/allocator',
+                '<(target_arch)',
+              ],
+            },
+          ],
+        },
+      ],
+    }],
     ['use_experimental_allocator_shim==1', {
       'targets': [
         {
           # GN: //base/allocator:unified_allocator_shim
           'target_name': 'unified_allocator_shim',
           'toolsets': ['host', 'target'],
           'type': 'static_library',
           'defines': [ 'BASE_IMPLEMENTATION' ],
           'sources': [
             'allocator_shim.cc',
@@ skipping 16 matching lines @@
               'sources': [
                 'allocator_shim_default_dispatch_to_glibc.cc',
               ],
             }],
           ]
         },  # 'unified_allocator_shim' target.
       ],
     }]
   ],
 }