allocator cleanup: remove dependencies on allocator from all targets

Overview of the cleanup:
------------------------
- In the context of the discussion in https://goo.gl/K2m649 our
  illustrious base/ owners suggested that having base being the only
  target depending on allocator (and having the other targets inherit
  that recursively) would be a more scalable solution, as opposite to
  having to remember to add an exec -> allocator to each target.
- This base -> allocator dep landed in crrev.com/1616793003.
- After that CL, until this point, many targets got two paths that lead
  to allocator:
    1. The indirect one via base (content_shell -> base -> allocator)
       which is what we want to preserve.
    2. The direct one (content_shell -> allocator) which is the
       inconsistent one we want to drop.

This CL gets rid of all the instances of 2.
The nice property of this sequencing of CLs is that the effect of this
large change on the final .ninja files is minimal. See details below.

Effect on the produced ninja files:
-----------------------------------

GYP, Linux, static build: https://paste.ee/p/RaJLj
  Just some small reordering of include paths.
  Dropping --rdynamic (as expected) in keyboard_unittests

GN, Linux, static build: https://paste.ee/p/zYtrQ
  Various targets lose the dependency on allocator.stamp (expected, the
  order is enforced by depending on base which depends on allocator.stamp)

GN, Android (both component and static are similar): https://paste.ee/p/Iq6DD
  As above.

GN, Linux, component build: https://paste.ee/p/jHUmv
  This is the most juicy change. As expected all the ODR goes away and
  random targets stop re-linking tcmalloc .o files.

GYP, Win, static: https://paste.ee/p/j0IjL
  Extremely minimal changes: All.ninja stops depending on libcmt.lib.
  Sounds fine as base (which depends on that) is definitely depending on libcmt.

GN, Win, static: https://paste.ee/p/Q6zTo
  Minimal change, like Linux GN, dropping dependencies on the .stamp files.

BUG=564618
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1647453002

Cr-Commit-Position: refs/heads/master@{#372167}

13 files changed, 0 insertions, 132 deletions

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index db8d6d6..d3e7daf 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -178,7 +178,6 @@ if (!is_android) {
         ":browser_dependencies",
         ":child_dependencies",
         ":manpage",
-        "//base/allocator",
 
         # Needed to use the master_preferences functions
         "//chrome/installer/util:with_no_strings",
@@ -293,7 +292,6 @@ if (is_mac || is_win) {
 
     deps = [
       ":browser_dependencies",
-      "//base/allocator",
       "//build/config/sanitizers:deps",
     ]
     if (is_win) {
@@ -394,7 +392,6 @@ if (is_mac || is_win) {
         ":child_dependencies",
         ":chrome_child_manifest",
         ":chrome_dll_version",
-        "//base/allocator",
         "//build/config/sanitizers:deps",
         "//components/browser_watcher:browser_watcher_client",
         "//components/crash/content/app",
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
index d6d3312..47f2541 100644
--- a/chrome/android/chrome_apk.gyp
+++ b/chrome/android/chrome_apk.gyp
@@ -127,11 +127,6 @@
             }],
           ],
         }],  # order_profiling!=0
-        ['use_allocator!="none"', {
-          'dependencies': [
-            '../../base/allocator/allocator.gyp:allocator',
-          ],
-        }],
       ],
     },
     {
diff --git a/chrome/browser/resources/chromeos/chromevox/BUILD.gn b/chrome/browser/resources/chromeos/chromevox/BUILD.gn
index 23b5f99..8c015ed 100644
--- a/chrome/browser/resources/chromeos/chromevox/BUILD.gn
+++ b/chrome/browser/resources/chromeos/chromevox/BUILD.gn
@@ -316,7 +316,6 @@ test("chromevox_tests") {
     ":chromevox_unitjs_tests",
     "//base",
     "//base:i18n",
-    "//base/allocator",
     "//base/test:test_support",
     "//chrome:browser_tests_pak",
     "//chrome:packed_extra_resources",
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi
index 5d43b38..e6c0f82 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi
@@ -125,11 +125,6 @@
             '<(DEPTH)/native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',
           ],
         }],
-        ['OS=="win" and win_use_allocator_shim==1', {
-          'dependencies': [
-            '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-          ],
-        }],
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index e0dc0d9..b309a66 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -22,7 +22,6 @@
       'common',
       '../sync/sync.gyp:sync',
     ],
-    'allocator_target': '../base/allocator/allocator.gyp:allocator',
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'conditions': [
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 0f781cd..de456dd 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -248,11 +248,6 @@
                 },
               },
               'conditions': [
-                ['win_use_allocator_shim==1', {
-                  'dependencies': [
-                    '<(allocator_target)',
-                  ],
-                }],
                 ['enable_basic_printing==1 or enable_print_preview==1', {
                   'dependencies': [
                     '../printing/printing.gyp:printing',
@@ -365,11 +360,6 @@
             'app/chrome_main_delegate.h',
           ],
           'conditions': [
-            ['OS=="win" and win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
             ['OS=="win"', {
               'conditions': [
                 ['chrome_pgo_phase!=0', {
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 3463221..41150ff 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -160,12 +160,6 @@
             },
           ],
           'conditions': [
-            ['use_allocator!="none"', {
-                'dependencies': [
-                  '<(allocator_target)',
-                ],
-              },
-            ],
             ['profiling==0 and linux_disable_pie==0', {
               'ldflags': [
                 '-pie',
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 7735229..407fe04 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -322,11 +322,6 @@
                 },
               },
             }],
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
           ],
         },
         {
@@ -370,13 +365,6 @@
             'installer/setup/setup_util_unittest.h',
             'installer/setup/update_active_setup_version_work_item_unittest.cc',
           ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 62161e6..ec1fd7f 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1828,13 +1828,6 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
           ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                 '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
           'msvs_settings': {
             'VCLinkerTool': {
               'conditions': [
@@ -2419,13 +2412,6 @@
           'dependencies': [
             'chrome_version_resources',
           ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
         }, { # else: OS != "win"
           'sources!': [
             'app/chrome_command_ids.h',
@@ -2524,15 +2510,6 @@
             'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc',
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "android"', {
-          'conditions': [
-            ['use_allocator!="none"', {
-              'dependencies': [
-                '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-        }],
         ['chromeos == 1', {
           'sources': [
             'browser/extensions/api/networking_private/networking_private_apitest.cc',
@@ -2749,13 +2726,6 @@
           'dependencies': [
             'chrome_version_resources',
           ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
@@ -2804,20 +2774,6 @@
             'test/perf/mach_ports_performancetest.cc',
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "android"', {
-          'conditions': [
-            ['use_allocator!="none"', {
-              'dependencies': [
-                '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-        }],
-        ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
-          'dependencies': [
-            '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-          ],
-        }],
       ],  # conditions
     },  # target performance_browser_tests
     {
@@ -2954,13 +2910,6 @@
           'dependencies': [
             'chrome_version_resources',
           ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
           'configurations': {
             'Debug': {
               'msvs_settings': {
@@ -3061,13 +3010,6 @@
           'dependencies': [
             'chrome_version_resources',
           ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
           'configurations': {
             'Debug': {
               'msvs_settings': {
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 9a292c1..03aa18b 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2603,15 +2603,6 @@
             },
           },
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
-          'conditions': [
-            ['use_allocator!="none"', {
-              'dependencies': [
-                '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-        }],
         ['OS=="mac"', {
           # The test fetches resources which means Mac need the app bundle to
           # exist on disk so it can pull from it.
@@ -2699,11 +2690,6 @@
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
           ],
           'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
             ['branding!="Chrome"', {
               'sources!': [
                 'browser/google/google_update_win_unittest.cc',
@@ -2925,13 +2911,6 @@
             '../breakpad/breakpad.gyp:*',
             '../components/components.gyp:crash_component',
           ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
         }],
       ],
     },
diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn
index ca52311..efb176b 100644
--- a/chrome/installer/setup/BUILD.gn
+++ b/chrome/installer/setup/BUILD.gn
@@ -22,7 +22,6 @@ if (is_win) {
 
     deps = [
       ":lib",
-      "//base/allocator",
       "//build/config/sanitizers:deps",
       "//components/crash/content/app:app_breakpad_mac_win_to_be_deleted",
     ]
@@ -83,7 +82,6 @@ if (is_win) {
       ":lib",
       "//base",
       "//base:i18n",
-      "//base/allocator",
       "//base/test:test_support",
       "//chrome/installer/mini_installer:unit_tests",
       "//testing/gmock",
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 648869a..c24d62a 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -337,7 +337,6 @@ if (!is_android) {
     deps = [
       ":test_support",
       ":test_support_ui",
-      "//base/allocator",
       "//chrome:packed_extra_resources",
       "//chrome:packed_resources",
       "//chrome:resources",
@@ -850,7 +849,6 @@ if (!is_android) {
       ":test_support_ui",
       "//base",
       "//base:i18n",
-      "//base/allocator",
       "//base/test:test_support",
       "//chrome:browser_tests_pak",
       "//chrome:packed_extra_resources",
@@ -1316,7 +1314,6 @@ if (!is_android) {
       ":sync_integration_test_support",
       ":test_support",
       ":test_support_ui",
-      "//base/allocator",
       "//chrome:packed_extra_resources",
       "//chrome:packed_resources",
       "//chrome:resources",
@@ -1400,7 +1397,6 @@ if (!is_android) {
     deps = [
       ":sync_integration_test_support",
       ":test_support_ui",
-      "//base/allocator",
       "//crypto:platform",
       "//sync",
       "//testing/gmock",
@@ -1563,7 +1559,6 @@ test("unit_tests") {
     "//testing/gtest",
 
     # 3) anything tests directly depend on
-    "//base/allocator",
     "//chrome:resources",
     "//chrome:strings",
     "//components/safe_browsing_db:test_database_manager",
@@ -2131,7 +2126,6 @@ if (is_win || (is_linux && !is_chromeos)) {
     ]
     deps = [
       ":test_support",
-      "//base/allocator",
       "//base/test:run_all_unittests",
       "//base/test:test_support",
       "//breakpad:client",
@@ -2161,7 +2155,6 @@ if (is_win || (is_linux && !is_chromeos)) {
       ":test_support_ui",
       "//base",
       "//base:i18n",
-      "//base/allocator",
       "//base/test:test_support",
       "//chrome/browser",
       "//chrome/renderer",
diff --git a/chrome/tools/service_discovery_sniffer/BUILD.gn b/chrome/tools/service_discovery_sniffer/BUILD.gn
index 0f895c5..9b8b2c9 100644
--- a/chrome/tools/service_discovery_sniffer/BUILD.gn
+++ b/chrome/tools/service_discovery_sniffer/BUILD.gn
@@ -13,7 +13,6 @@ executable("service_discovery_sniffer") {
 
   deps = [
     "//base",
-    "//base/allocator",
     "//base/test:test_support",
     "//build/config/sanitizers:deps",
     "//chrome/browser",