Update lingering references to infra/config/global.

Tbr: martiniss@chromium.org,sergeyberezin@chromium.org
Change-Id: Ia5cbad029376949e2ea0fc7dac7e4adf3191954e
Reviewed-on: https://chromium-review.googlesource.com/c/1468864
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#631486}
diff --git a/docs/gpu/gpu_testing_bot_details.md b/docs/gpu/gpu_testing_bot_details.md
index 0e4a25e..6a4d76e 100644
--- a/docs/gpu/gpu_testing_bot_details.md
+++ b/docs/gpu/gpu_testing_bot_details.md
@@ -390,9 +390,9 @@
 
 [bots.cfg]:            https://chrome-internal.googlesource.com/infradata/config/+/master/configs/chromium-swarm/bots.cfg
 [infradata/config]:    https://chrome-internal.googlesource.com/infradata/config/
-[cr-buildbucket.cfg]:  https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/cr-buildbucket.cfg
-[luci-milo.cfg]:  https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/luci-milo.cfg
-[luci-scheduler.cfg]:  https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/luci-scheduler.cfg
+[cr-buildbucket.cfg]:  https://chromium.googlesource.com/chromium/src/+/master/infra/config/cr-buildbucket.cfg
+[luci-milo.cfg]:  https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg
+[luci-scheduler.cfg]:  https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-scheduler.cfg
 [GPU FYI Win Builder]: https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/GPU%20FYI%20Win%20Builder
 
 ### How to start running tests on a new GPU type on an existing try bot
diff --git a/docs/infra/new_builder.md b/docs/infra/new_builder.md
index 70e250f..1553e90 100644
--- a/docs/infra/new_builder.md
+++ b/docs/infra/new_builder.md
@@ -14,7 +14,7 @@
 2. in [chromium/tools/build][17], modifying the chromium\_tests
    configuration.
 3. in [chromium/src][18], modifying all of the following:
-    1. LUCI service configurations in `//infra/config/global`
+    1. LUCI service configurations in `//infra/config`
     2. Compile configuration in `//tools/mb`
     3. Test configuration in `//testing/buildbot`
 
@@ -170,7 +170,7 @@
 
 ### LUCI services
 
-LUCI services used by chromium are configured in [//infra/config/global][6].
+LUCI services used by chromium are configured in [//infra/config][6].
 
 #### Buildbucket
 
@@ -322,13 +322,13 @@
 [3]: https://bit.ly/chromium-build-naming
 [4]: https://luci-config.appspot.com/#/services/chromium-swarm
 [5]: https://chromium.googlesource.com/chromium/tools/build/+/master/scripts/slave/recipe_modules/chromium_tests
-[6]: /infra/config/global
+[6]: /infra/config
 [7]: https://luci-config.appspot.com/schemas/projects:cr-buildbucket.cfg
-[8]: /infra/config/global/cr-buildbucket.cfg
+[8]: /infra/config/cr-buildbucket.cfg
 [9]: http://luci-config.appspot.com/schemas/projects:luci-milo.cfg
-[10]: /infra/config/global/luci-milo.cfg
+[10]: /infra/config/luci-milo.cfg
 [11]: https://chromium.googlesource.com/infra/luci/luci-go/+/master/scheduler/appengine/messages/config.proto
-[12]: /infra/config/global/luci-scheduler.cfg
+[12]: /infra/config/luci-scheduler.cfg
 [13]: /tools/mb/README.md
 [14]: /tools/mb/docs/user_guide.md#the-mb_config_pyl-config-file
 [15]: /testing/buildbot/README.md
diff --git a/infra/config/luci-milo-dev.cfg b/infra/config/luci-milo-dev.cfg
index 3e8c9f3..a5b7407 100644
--- a/infra/config/luci-milo-dev.cfg
+++ b/infra/config/luci-milo-dev.cfg
@@ -136,7 +136,7 @@
     }
     links: {
       text: "customize"
-      url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/luci-milo-dev.cfg"
+      url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo-dev.cfg"
       alt: "Customize this console"
     }
   }
diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg
index b71b468..abf8c00 100644
--- a/infra/config/luci-milo.cfg
+++ b/infra/config/luci-milo.cfg
@@ -209,7 +209,7 @@
     }
     links {
       text: "customize"
-      url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/luci-milo.cfg"
+      url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
       alt: "Customize this console"
     }
   }
diff --git a/testing/buildbot/generate_buildbot_json.py b/testing/buildbot/generate_buildbot_json.py
index 3016600..a2ec27a 100755
--- a/testing/buildbot/generate_buildbot_json.py
+++ b/testing/buildbot/generate_buildbot_json.py
@@ -866,7 +866,7 @@
                         self.generate_waterfall_json(waterfall))
 
   def get_valid_bot_names(self):
-    # Extract bot names from infra/config/global/luci-milo.cfg.
+    # Extract bot names from infra/config/luci-milo.cfg.
     # NOTE: This reference can cause issues; if a file changes there, the
     # presubmit here won't be run by default. A manually maintained list there
     # tries to run presubmit here when luci-milo.cfg is changed. If any other
@@ -876,7 +876,7 @@
     bot_names = set()
     infra_config_dir = os.path.abspath(
         os.path.join(os.path.dirname(__file__),
-                     '..', '..', 'infra', 'config', 'global'))
+                     '..', '..', 'infra', 'config'))
     milo_configs = [
         os.path.join(infra_config_dir, 'luci-milo.cfg'),
         os.path.join(infra_config_dir, 'luci-milo-dev.cfg'),
@@ -1578,4 +1578,4 @@
 
 if __name__ == "__main__": # pragma: no cover
   generator = BBJSONGenerator()
-  sys.exit(generator.main(sys.argv[1:]))
\ No newline at end of file
+  sys.exit(generator.main(sys.argv[1:]))
diff --git a/testing/buildbot/generate_buildbot_json_unittest.py b/testing/buildbot/generate_buildbot_json_unittest.py
index c5c47b7..942cacbe 100755
--- a/testing/buildbot/generate_buildbot_json_unittest.py
+++ b/testing/buildbot/generate_buildbot_json_unittest.py
@@ -18,7 +18,7 @@
     super(FakeBBGen, self).__init__()
     infra_config_dir = os.path.abspath(
         os.path.join(os.path.dirname(__file__), '..', '..',
-                    'infra', 'config', 'global'))
+                    'infra', 'config'))
     luci_milo_cfg_path = os.path.join(infra_config_dir, 'luci-milo.cfg')
     luci_milo_dev_cfg_path = os.path.join(infra_config_dir, 'luci-milo-dev.cfg')
     self.files = {