Revert "OS Settings: Move grit() target to settings/chromeos"

This reverts commit b9c180c8.

Reason for revert: Merge conflicts with actual revert for tree closing compile error described at crbug.com/1143504 - reverting both patches to be safe.

Original change's description:
> OS Settings: Move grit() target to settings/chromeos
>
> Followup from
> https://chromium-review.googlesource.com/c/chromium/src/+/2493991
>
> Bug: 1132403
> Change-Id: Idc2d9473feef2ad9746473a6bd8724a2f15616ff
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505955
> Reviewed-by: dpapad <dpapad@chromium.org>
> Reviewed-by: Avi Drissman <avi@chromium.org>
> Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#821810}

TBR=avi@chromium.org,dpapad@chromium.org,rbpotter@chromium.org

Change-Id: I71d85c4595988a1b93aabf0ebe59e32e61c4c6fc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1132403, 1143504
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505356Reviewed-by: Patti <patricialor@chromium.org>
Commit-Queue: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821996}

chrome/BUILD.gn

@@ -1369,10 +1369,10 @@ group("extra_resources") {
       "//chrome/browser/resources:nearby_share_dialog_resources",
       "//chrome/browser/resources:nearby_shared_resources",
       "//chrome/browser/resources:nearby_shared_resources_v3",
+      "//chrome/browser/resources:os_settings_resources",
       "//chrome/browser/resources/chromeos:cellular_setup_resources",
       "//chrome/browser/resources/chromeos:multidevice_setup_resources",
       "//chrome/browser/resources/chromeos/accessibility:build",
-      "//chrome/browser/resources/settings/chromeos:os_settings_resources",
       "//third_party/ink:ink_resources",
     ]
   }

chrome/browser/resources/BUILD.gn

@@ -351,6 +351,36 @@ if (is_chromeos) {
     output_dir = "$root_gen_dir/chrome"
   }
 
+  grit("os_settings_resources") {
+    grit_flags = [
+      "-E",
+      "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+      "-E",
+      "root_src_dir=" + rebase_path("//", root_build_dir),
+    ]
+
+    defines = chrome_grit_defines
+
+    # These arguments are needed since the grd is generated at build time.
+    enable_input_discovery_for_gn_analyze = false
+    defines += [ "SHARED_INTERMEDIATE_DIR=" +
+                 rebase_path(root_gen_dir, root_build_dir) ]
+    settings_gen_dir = "$root_gen_dir/chrome/browser/resources/settings"
+    source = "$settings_gen_dir/chromeos/os_settings_resources.grd"
+    deps = [
+      "//chrome/browser/resources/settings/chromeos:build_grd",
+      "//chrome/browser/ui/webui/settings/chromeos:mojom_js",
+    ]
+
+    outputs = [
+      "grit/os_settings_resources.h",
+      "grit/os_settings_resources_map.cc",
+      "grit/os_settings_resources_map.h",
+      "os_settings_resources.pak",
+    ]
+    output_dir = "$root_gen_dir/chrome"
+  }
+
   grit("bluetooth_pairing_dialog_resources") {
     grit_flags = [
       "-E",

chrome/browser/resources/settings/chromeos/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_grit.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
@@ -177,32 +176,6 @@ preprocess_grit("preprocess_external_mojo") {
   ]
 }
 
-grit("os_settings_resources") {
-  grit_flags = [
-    "-E",
-    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
-    "-E",
-    "root_src_dir=" + rebase_path("//", root_build_dir),
-  ]
-
-  defines = chrome_grit_defines
-
-  # These arguments are needed since the grd is generated at build time.
-  enable_input_discovery_for_gn_analyze = false
-  defines +=
-      [ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ]
-  source = "$target_gen_dir/os_settings_resources.grd"
-  deps = [ ":build_grd" ]
-
-  outputs = [
-    "grit/os_settings_resources.h",
-    "grit/os_settings_resources_map.cc",
-    "grit/os_settings_resources_map.h",
-    "os_settings_resources.pak",
-  ]
-  output_dir = "$root_gen_dir/chrome"
-}
-
 generate_grd("build_grd") {
   grd_prefix = "os_settings"
   out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"

chrome/chrome_paks.gni

@@ -199,9 +199,9 @@ template("chrome_extra_paks") {
         "//chrome/browser/resources:nearby_share_dialog_resources",
         "//chrome/browser/resources:nearby_shared_resources",
         "//chrome/browser/resources:nearby_shared_resources_v3",
+        "//chrome/browser/resources:os_settings_resources",
         "//chrome/browser/resources/chromeos:cellular_setup_resources",
         "//chrome/browser/resources/chromeos:multidevice_setup_resources",
-        "//chrome/browser/resources/settings/chromeos:os_settings_resources",
         "//chrome/browser/supervised_user:supervised_user_unscaled_resources",
         "//chromeos/resources",
         "//chromeos/resources:camera_app_resources",