Revert of Reland of: Allow base to depend on allocator

base/base.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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
     'base.gypi',
   ],
   'targets': [
     {
       'target_name': 'base',
       'type': '<(component)',
       'toolsets': ['host', 'target'],
       'variables': {
         'base_target': 1,
         'enable_wexit_time_destructors': 1,
         'optimize': 'max',
       },
       'dependencies': [
-        'allocator/allocator.gyp:allocator',
         'base_debugging_flags#target',
         'base_static',
         '../testing/gtest.gyp:gtest_prod',
         '../third_party/modp_b64/modp_b64.gyp:modp_b64',
         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
       # TODO(gregoryd): direct_dependent_settings should be shared with the
       #  64-bit target, but it doesn't work due to a bug in gyp
       'direct_dependent_settings': {
         'include_dirs': [
@@ skipping 721 matching lines @@
         }],
         ['use_ozone == 1', {
           'sources!': [
             'message_loop/message_pump_glib_unittest.cc',
           ]
         }],
         ['OS == "linux"', {
           'dependencies': [
             'malloc_wrapper',
           ],
-        }],
+          'conditions': [
+            ['use_allocator!="none"', {
+              'dependencies': [
+                'allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ]},
+        ],
         [ 'OS == "win" and target_arch == "x64"', {
           'sources': [
             'profiler/win32_stack_frame_unwinder_unittest.cc',
           ],
           'dependencies': [
             'base_profiler_test_support_library',
           ],
         }],
         ['OS == "win"', {
           'sources!': [
             'file_descriptor_shuffle_unittest.cc',
             'files/dir_reader_posix_unittest.cc',
             'message_loop/message_pump_libevent_unittest.cc',
             'threading/worker_pool_posix_unittest.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [
             4267,
           ],
           'conditions': [
+            # This is needed so base_unittests uses the allocator shim, as
+            # SecurityTest.MemoryAllocationRestriction* tests are dependent
+            # on tcmalloc.
+            # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
+            # their own test suite.
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                'allocator/allocator.gyp:allocator',
+              ],
+            }],
             ['icu_use_data_file_flag==0', {
               # This is needed to trigger the dll copy step on windows.
               # TODO(mark): This should not be necessary.
               'dependencies': [
                 '../third_party/icu/icu.gyp:icudata',
               ],
             }],
           ],
         }, {  # OS != "win"
           'dependencies': [
@@ skipping 930 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'base_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }