Revert 203907 "Modify base_unittests.exe to use the allocator shims"

trunk/src/base/base.gyp

Index: trunk/src/base/base.gyp
===================================================================
--- trunk/src/base/base.gyp	(revision 203910)
+++ trunk/src/base/base.gyp	(working copy)
@@ -754,9 +754,9 @@
             'message_pump_glib_unittest.cc',
           ]
         }],
+        # This is needed to trigger the dll copy step on windows.
+        # TODO(mark): This should not be necessary.
         ['OS == "win"', {
-          # 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',
           ],
@@ -770,18 +770,6 @@
           'msvs_disabled_warnings': [
             4267,
           ],
-          # 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.
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                'allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
         }, {  # OS != "win"
           'dependencies': [
             '../third_party/libevent/libevent.gyp:libevent'