Revert of GN: Specify grit generated output paths to be the same as gyp's.

chrome/app/BUILD.gn

Index: chrome/app/BUILD.gn
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index b226380bc08f6900a9cfeb20f46a3db3d8b3baef..80becce785e84f1d96c6c3f26b18f052f8998385 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -8,7 +8,6 @@
 #              (generate_generated_resources action)
 grit("generated_resources") {
   source = "generated_resources.grd"
-  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/generated_resources.h",
     "generated_resources_am.pak",
@@ -75,8 +74,8 @@
 
   script = "//chrome/browser/metrics/variations/generate_resources_map.py"
 
-  inputs = [ "$root_gen_dir/chrome/grit/generated_resources.h" ]
-  outputs = [ "$root_gen_dir/chrome/generated_resources_map.cc" ]
+  inputs = [ "$target_gen_dir/grit/generated_resources.h" ]
+  outputs = [ "$target_gen_dir/generated_resources_map.cc" ]
 
   args = rebase_path(inputs, root_build_dir) +
       rebase_path(outputs, root_build_dir)
@@ -95,7 +94,6 @@
 #              (generate_google_chrome_strings action)
 grit("google_chrome_strings") {
   source = "google_chrome_strings.grd"
-  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/google_chrome_strings.h",
     "google_chrome_strings_am.pak",
@@ -159,7 +157,6 @@
 #              (generate_chromium_strings action)
 grit("chromium_strings") {
   source = "chromium_strings.grd"
-  output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/chromium_strings.h",
     "chromium_strings_am.pak",