Revert 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 b08994e0428e0aa95cfcdf5462712bd748d0b639..94a1d49258572d0833fca927e599874541efca0f 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -21,7 +21,6 @@
         'optimize': 'max',
       },
       'dependencies': [
-        'allocator/allocator.gyp:allocator',
         'base_debugging_flags#target',
         'base_static',
         '../testing/gtest.gyp:gtest_prod',
@@ -762,7 +761,14 @@
           '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',
@@ -783,6 +789,16 @@
             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.