diff --git a/.gitignore b/.gitignore
index 19a55bd890cc24..8b08ffa762d129 100644
--- a/.gitignore
+++ b/.gitignore
@@ -281,7 +281,6 @@ vs-chromium-project.txt
 /sql/sql_unittests_run.xml
 /sync/sync.xml
 /testing/libfuzzer/fuzzer_corpus_for_bots/
-/testing/location_tags.json
 /testing/rts/
 /testserver.log
 # See third_party/.gitignore for entries covering src/third_party.
diff --git a/DEPS b/DEPS
index 0a507990b0b3fa..00a5e6d87f28d7 100644
--- a/DEPS
+++ b/DEPS
@@ -4366,17 +4366,6 @@ hooks = [
     ],
   },
 
-  {
-    'name': 'Generate component metadata for tests',
-    'pattern': '.',
-    'action': [
-      'vpython',
-      'src/testing/generate_location_tags.py',
-      '--out',
-      'src/testing/location_tags.json',
-    ],
-  },
-
   # Download and initialize "vpython" VirtualEnv environment packages.
   {
     'name': 'vpython_common',
diff --git a/build/config/fuchsia/generate_runner_scripts.gni b/build/config/fuchsia/generate_runner_scripts.gni
index 53658ed8b8d8d4..f7dbb61813ad11 100644
--- a/build/config/fuchsia/generate_runner_scripts.gni
+++ b/build/config/fuchsia/generate_runner_scripts.gni
@@ -91,10 +91,6 @@ template("fuchsia_package_runner") {
       data = []
     }
 
-    if (defined(invoker.data)) {
-      data += invoker.data
-    }
-
     wrapper_script = generated_run_pkg_script_path
 
     data_deps = [
diff --git a/testing/generate_location_tags.py b/testing/generate_location_tags.py
deleted file mode 100755
index 2860d9db1be370..00000000000000
--- a/testing/generate_location_tags.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2021 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.
-"""Generates the directory->tags mapping used by ResultDB."""
-
-# pylint: disable=line-too-long
-#
-# For more on the tags, see
-# https://source.chromium.org/chromium/infra/infra/+/master:go/src/go.chromium.org/luci/resultdb/sink/proto/v1/location_tag.proto
-#
-# pylint: enable=line-too-long
-
-import argparse
-import os
-import subprocess
-import sys
-
-THIS_DIR = os.path.dirname(__file__)
-SRC_DIR = os.path.dirname(THIS_DIR)
-BUILD_DIR = os.path.join(SRC_DIR, 'build')
-sys.path.insert(0, BUILD_DIR)
-import find_depot_tools
-
-def main():
-  parser = argparse.ArgumentParser()
-  parser.add_argument('-o', '--out', required=True,
-                      help='path to write location tag metadata to')
-  args = parser.parse_args()
-
-  exe = os.path.join(find_depot_tools.DEPOT_TOOLS_PATH, 'dirmd')
-  if sys.platform == 'win32':
-    exe = exe + '.bat'
-
-  return subprocess.call([
-    exe,
-    'location-tags',
-    '-out', args.out,
-    '-root', SRC_DIR,
-    '-repo', 'https://chromium.googlesource.com/chromium/src',
-    ])
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/testing/test.gni b/testing/test.gni
index 57150149fed2de..2708c5f834eb78 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -78,13 +78,11 @@ template("test") {
       executable(_exec_target) {
         # Configs will always be defined since we set_defaults in BUILDCONFIG.gn.
         configs = []
-        forward_variables_from(
-            invoker,
-            "*",
-            TESTONLY_AND_VISIBILITY + _wrapper_script_vars + [
-                  "data_deps",
-                  "extra_dist_files",
-                ])
+        data_deps = []
+        forward_variables_from(invoker,
+                               "*",
+                               TESTONLY_AND_VISIBILITY + _wrapper_script_vars +
+                                   [ "extra_dist_files" ])
 
         # Thanks to the set_defaults() for test(), configs are initialized with
         # the default shared_library configs rather than executable configs.
@@ -94,16 +92,6 @@ template("test") {
         ]
         configs += [ "//build/config:executable_config" ]
 
-        if (defined(invoker.data_deps)) {
-          data_deps = invoker.data_deps
-        } else {
-          data_deps = []
-        }
-        if (!defined(data)) {
-          data = []
-        }
-        data += [ "//testing/location_tags.json" ]
-
         # Don't output to the root or else conflict with the group() below.
         output_name = rebase_path(_exec_output, root_out_dir)
       }
@@ -237,13 +225,6 @@ template("test") {
           ":$_library_target",
         ]
       }
-
-      if (defined(invoker.data_deps)) {
-        data_deps = invoker.data_deps
-      } else {
-        data_deps = []
-      }
-      data = [ "//testing/location_tags.json" ]
     }
   } else if (is_fuchsia) {
     assert(!defined(invoker.use_xvfb) || !invoker.use_xvfb)
@@ -298,7 +279,6 @@ template("test") {
       package = ":$_pkg_target"
       package_name_override = _output_name
 
-      data = [ "//testing/location_tags.json" ]
       data_deps = [ "//testing/buildbot/filters:fuchsia_filters" ]
     }
 
@@ -336,6 +316,7 @@ template("test") {
       forward_variables_from(invoker,
                              [
                                "data",
+                               "data_deps",
                                "deps",
                                "executable_args",
                                "retries",
@@ -353,11 +334,6 @@ template("test") {
       ]
 
       wrapper_output_name = "${_wrapper_output_name}"
-
-      if (!defined(data)) {
-        data = []
-      }
-      data += [ "//testing/location_tags.json" ]
     }
 
     _resources_bundle_data = target_name + "_resources_bundle_data"
@@ -428,7 +404,6 @@ template("test") {
       generated_script = "$root_build_dir/bin/run_" + invoker.target_name
       test_exe = invoker.target_name
       runtime_deps_file = _runtime_deps_file
-      data = [ "//testing/location_tags.json" ]
     }
 
     executable(target_name) {
@@ -478,7 +453,6 @@ template("test") {
         executable = "//testing/test_env.py"
         data += [ "//testing/test_env.py" ]
       }
-      data += [ "//testing/location_tags.json" ]
 
       executable_args = [
         "@WrappedPath(../../build/lacros/test_runner.py)",
@@ -554,7 +528,6 @@ template("test") {
         executable = "//testing/test_env.py"
         data += [ "//testing/test_env.py" ]
       }
-      data += [ "//testing/location_tags.json" ]
 
       executable_args = [
         "@WrappedPath(./${_executable})",
@@ -658,8 +631,6 @@ template("script_test") {
     if (defined(invoker.data)) {
       data += invoker.data
     }
-    data += [ "//testing/location_tags.json" ]
-
     data_deps = []
     if (defined(invoker.data_deps)) {
       data_deps += invoker.data_deps