Revert of Reland of: Allow base to depend on allocator

base/BUILD.gn

 # 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.
 
 # HOW TO WRITE CONDITIONALS IN THIS FILE
 # ======================================
 #
 # In many other places, one would write a conditional that expresses all the
 # cases when a source file is used or unused, and then either add or subtract
 # it from the sources list in that case
@@ skipping 935 matching lines @@
   data = []
 
   configs += [
     ":base_flags",
     ":base_implementation",
     "//base/allocator:allocator_shim_define",  # for allocator_check.cc.
     "//build/config:precompiled_headers",
   ]
 
   deps = [
-    "//base/allocator",
     "//base/third_party/dynamic_annotations",
     "//third_party/modp_b64",
   ]
 
   public_deps = [
     ":base_paths",
     ":base_static",
     ":debugging_flags",
   ]
 
@@ skipping 888 matching lines @@
     "win/win_util_unittest.cc",
     "win/wrapped_window_proc_unittest.cc",
   ]
 
   deps = [
     ":base",
     ":i18n",
     ":message_loop_tests",
     ":prefs",
     ":prefs_test_support",
+    "//base/allocator",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//base/third_party/dynamic_annotations",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/icu",
   ]
 
-  # Some unittests depend on the ALLOCATOR_SHIM macro.
-  configs += [ "//base/allocator:allocator_shim_define" ]
-
   data = [
     "test/data/",
   ]
 
   # Allow more direct string conversions on platforms with native utf8
   # strings
   if (is_mac || is_ios || is_chromeos) {
     defines = [ "SYSTEM_NATIVE_UTF8" ]
   }
 
@@ skipping 252 matching lines @@
 
   # GYP: //base.gyp:base_java_unittest_support
   android_library("base_java_unittest_support") {
     deps = [
       ":base_java",
     ]
     java_files =
         [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
   }
 }