allocator cleanup: remove dependencies on allocator from all targets

content/content_tests.gypi

 # Copyright (c) 2013 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': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 1207 matching lines @@
             }],
             ['enable_web_speech==1', {
               'sources': [ '<@(content_unittests_speech_sources)' ],
             }],
             ['OS=="linux" and use_dbus==1', {
               'dependencies': [
                 '../build/linux/system.gyp:dbus',
                 '../dbus/dbus.gyp:dbus_test_support',
               ],
             }],
-            ['OS=="win" and win_use_allocator_shim==1', {
-              'dependencies': [
-                '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
             ['OS=="win"', {
               'dependencies': [
                 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
               ],
             }],
             ['OS=="mac"', {
               # These flags are needed to run the test on Mac.
               # Search for comments about "xcode_settings" in chrome_tests.gypi.
               'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
             }],
@@ skipping 113 matching lines @@
             'common/cc_messages_perftest.cc',
             'common/discardable_shared_memory_heap_perftest.cc',
             'test/run_all_perftests.cc',
           ],
           'conditions': [
             ['OS == "android"', {
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ],
             }],
-            ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-              ],
-            }],
           ],
         },
         {
           # GN version: //content/tests:browsertest_support
           'target_name': 'content_browser_test_support',
           'type': 'static_library',
           'dependencies': [
             'content_shell_lib',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
@@ skipping 143 matching lines @@
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                     },
                   },
                 },
               },
               # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
               'msvs_disabled_warnings': [ 4267, ],
             }],
-            ['OS=="win" and win_use_allocator_shim==1', {
-              'dependencies': [
-                '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
             ['OS=="android"', {
               'sources': [ '<@(content_browsertests_android_sources)' ],
               'sources!': [
                 'browser/battery_status/battery_monitor_impl_browsertest.cc',
               ],
               'dependencies': [
                 'content_shell_jni_headers',
                 'content_shell_lib',
                 '../testing/android/native_test.gyp:native_test_support',
               ],
@@ skipping 79 matching lines @@
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ],
             }, {
               'dependencies': [
                 # Runtime dependencis.
                 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
                 '../third_party/mesa/mesa.gyp:osmesa',
               ],
             }],
-            ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-              ],
-            }],
           ],
         },
         {
           # GN version: //content/test:content_gl_benchmark
           'target_name': 'content_gl_benchmark',
           'type': '<(gtest_target_type)',
           'dependencies': [
             'content.gyp:content_common',
             'test_support_content',
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../ui/gl/gl.gyp:gl_test_support',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'common/gpu/client/gl_helper_benchmark.cc',
           ],
-          'conditions': [
-            ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
         },
       ],
     }],
     ['chromeos==1 or OS=="win" or OS=="android"', {
       'targets': [
           {
             # TODO(GYP): Port Windows and ChromeOS logic.
             # GN: //content/test:video_decode_accelerator_unittest
             'target_name': 'video_decode_accelerator_unittest',
             'type': '<(gtest_target_type)',
@@ skipping 36 matching lines @@
                 'sources/': [
                   ['exclude', '^common/gpu/media/android_video_decode_accelerator_unittest.cc'],
                 ],
               }],
               ['OS=="win"', {
                 'dependencies': [
                   '<(angle_path)/src/angle.gyp:libEGL',
                   '<(angle_path)/src/angle.gyp:libGLESv2',
                 ],
               }],
-              ['(OS=="win" and win_use_allocator_shim==1) or '
-               '(os_posix == 1 and OS != "android" and '
-               ' use_allocator!="none")', {
-                'dependencies': [
-                  '../base/allocator/allocator.gyp:allocator',
-                ],
-              }],
               ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
                 'include_dirs': [
                   '<(DEPTH)/third_party/libva',
                 ],
               }],
               ['use_x11==1', {
                 'dependencies': [
                   '../build/linux/system.gyp:x11',  # Used by rendering_helper.cc
                   '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
                 ],
@@ skipping 468 matching lines @@
                   'content_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }