Fix the allocator dependency to respect win_use_allocator_shim variable....

chrome/chrome_tests.gypi

 # Copyright (c) 2010 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' : {
     'browser_tests_sources_views_specific': [
       'browser/extensions/browser_action_test_util_views.cc',
       'browser/views/browser_actions_container_browsertest.cc',
     ],
@@ skipping 241 matching lines @@
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
-          'dependencies': [
-            '<(allocator_target)',
-          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],          
         }],
       ],
     },
     {
       'target_name': 'ui_tests',
       'type': 'executable',
       'msvs_guid': '76235B67-1C27-4627-8A33-4B2E1EF93EDE',
       'dependencies': [
         'chrome',
         'browser',
@@ skipping 116 matching lines @@
         }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
             'crash_service',  # run time dependency
             'security_tests',  # run time dependency
             'test_support_common',
             '../google_update/google_update.gyp:google_update',
-            '<(allocator_target)',
           ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],          
           'link_settings': {
             'libraries': [
               '-lOleAcc.lib',
             ],
           },
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ skipping 53 matching lines @@
         ['OS=="win"', {
           'dependencies': [
             'chrome_nacl_win64',
             'crash_service',  # run time dependency
             'security_tests',  # run time dependency
             'test_support_common',
             '../google_update/google_update.gyp:google_update',
             '../views/views.gyp:views',
             # run time dependency
             '../webkit/webkit.gyp:npapi_test_plugin',
-            '<(allocator_target)',
           ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],          
           'link_settings': {
             'libraries': [
               '-lOleAcc.lib',
             ],
           },
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ skipping 720 matching lines @@
           'defines': [
             '__STD_C',
             '_CRT_SECURE_NO_DEPRECATE',
             '_SCL_SECURE_NO_DEPRECATE',
           ],
           'dependencies': [
             'chrome_dll_version',
             'installer_util_strings',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             'test_chrome_plugin',  # run time dependency
-            '<(allocator_target)',
           ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],          
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'sources': [
             'app/chrome_dll.rc',
             'test/data/resource.rc',
 
             '<@(views_unit_tests_sources)',
 
             # TODO:  It would be nice to have these pulled in
@@ skipping 206 matching lines @@
             '<@(browser_tests_sources_win_specific)',
             '<@(browser_tests_sources_views_specific)'
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
             'chrome_dll_version',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
-            '<(allocator_target)',
           ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],          
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           }
         }],
@@ skipping 109 matching lines @@
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="linux" and toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
         ['OS=="win"', {
-          'dependencies': [
-            '<(allocator_target)',
-          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],          
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         },],
@@ skipping 30 matching lines @@
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/reliability/page_load_test.cc',
         'test/reliability/page_load_test.h',
         'test/reliability/reliability_test_suite.h',
         'test/reliability/run_all_unittests.cc',
       ],
       'conditions': [
-        ['OS=="win"', {
+        ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '<(allocator_target)',
           ],
         },],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         },],
       ],
@@ skipping 53 matching lines @@
       'sources': [
         'test/tab_switching/tab_switching_test.cc',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['OS=="win"', {
+        ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '<(allocator_target)',
           ],
         },],
       ],
     },
     {
       'target_name': 'memory_test',
       'type': 'executable',
       'msvs_guid': 'A5F831FD-9B9C-4FEF-9FBA-554817B734CE',
@@ skipping 41 matching lines @@
         '..',
       ],
       'sources': [
         'test/url_fetch_test/url_fetch_test.cc',
       ],
       'conditions': [
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
-          'dependencies': [
-            '<(allocator_target)',
-          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],          
         }], # OS="win"
       ], # conditions
     },
     {
       'target_name': 'common_net_test_support',
       'type': '<(library)',
       'sources': [
         'common/net/fake_network_change_notifier_thread.cc',
         'common/net/fake_network_change_notifier_thread.h',
         'common/net/thread_blocker.cc',
@@ skipping 142 matching lines @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
         'profile_import',
         'syncapi',
         'test_support_unit',
       ],
       'conditions': [
         ['OS=="win"', {
           'sources' : [
             'browser/sync/util/data_encryption_unittest.cc',
           ],
-          'dependencies': [
-            '<(allocator_target)',
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
           ],
           'link_settings': {
             'libraries': [
               '-lcrypt32.lib',
               '-lws2_32.lib',
               '-lsecur32.lib',
             ],
           },
           'configurations': {
             'Debug_Base': {
@@ skipping 129 matching lines @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
             'chrome_dll_version',
             'installer_util_strings',
             '../views/views.gyp:views',
             '../sandbox/sandbox.gyp:sandbox',
-            '<(allocator_target)',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
           ],
           'configurations': {
             'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
@@ skipping 18 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/plugin/plugin_test.cpp',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
-            '<(allocator_target)',
             'security_tests',  # run time dependency
           ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
         },],
       ],
     },
   ],
   'conditions': [
     ['OS!="mac"', {
       'targets': [
@@ skipping 44 matching lines @@
             ['OS=="win"', {
               'configurations': {
                 'Debug_Base': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                     },
                   },
                 },
               },
-              'dependencies': [
-                '<(allocator_target)',
+              'conditions': [
+                ['win_use_allocator_shim==1', {
+                  'dependencies': [
+                    '<(allocator_target)',
+                  ],
+                }],
               ],
             }],
           ],
         },
         # TODO(port): enable on mac.
         {
           'includes': ['test/interactive_ui/interactive_ui_tests.gypi']
         },
       ],
     },],  # OS!="mac"
@@ skipping 28 matching lines @@
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
             '<(DEPTH)/third_party/wtl/include',
           ],
           'sources': [
             'test/selenium/selenium_test.cc',
           ],
           'conditions': [
-            ['OS=="win"', {
+            ['OS=="win" and win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
               ],
             },],
           ],
         },
         {
           'target_name': 'test_chrome_plugin',
           'type': 'shared_library',
           'msvs_guid': '7F0A70F6-BE3F-4C19-B435-956AB8F30BA4',
@@ skipping 303 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: