Revert 146303 - Disables allocator_shim on Windows memory builders.

build/common.gypi

 # 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 1166 matching lines @@
         'win_debug_disable_iterator_debugging': '1',
         'win_debug_Optimization': '1',
         'win_debug_InlineFunctionExpansion': '0',
         'win_release_InlineFunctionExpansion': '0',
         'win_release_OmitFramePointers': '0',
 
         'linux_use_tcmalloc': 1,
         'release_valgrind_build': 1,
         'werror': '',
         'component': 'static_library',
-        'win_use_allocator_shim': 0,
         'use_system_zlib': 0,
       }],
 
       # Build tweaks for DrMemory.
       # TODO(rnk): Combine with tsan config to share the builder.
       # http://crbug.com/108155
       ['build_for_tool=="drmemory"', {
         # DrMemory can't handle the debug CRT dll, so build static.
         'component': 'static_library',
-        # Allocator_shim causes a linker error when we use std::locale.
-        'win_use_allocator_shim': 0,
         # These runtime checks force initialization of stack vars which blocks
         # DrMemory's uninit detection.
         'win_debug_RuntimeChecks': '0',
         # Iterator debugging is slow.
         'win_debug_disable_iterator_debugging': '1',
         # Try to disable optimizations that mess up stacks in a release build.
         'win_release_InlineFunctionExpansion': '0',
         'win_release_OmitFramePointers': '0',
         # Keep the code under #ifndef NVALGRIND.
         'release_valgrind_build': 1,
@@ skipping 2090 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }