Reland of: Allow base to depend on allocator

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 6c729f00e6d332f41d549cd4c8f4ad2c84d89bcf..bc315b69283362dc74b447bffa98b6bb86bdaa7e 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -21,6 +21,7 @@
         'optimize': 'max',
       },
       'dependencies': [
+        'allocator/allocator.gyp:allocator',
         'base_debugging_flags#target',
         'base_static',
         '../testing/gtest.gyp:gtest_prod',
@@ -762,14 +763,7 @@
           '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',
@@ -790,16 +784,6 @@
             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.