Remove use of bundle_plugins_dir

The path for plugins is always {{bundle_contents_dir}}/PlugIns
so remove uses of the variable (it is marked as mandatory in gn
docs but the check is incorrectly enforced so this won't cause
any error during generation) in preparation of removing it from
gn.

Bug: https://bugs.chromium.org/p/gn/issues/detail?id=64
Change-Id: Ibe43a7a6706436a6f2f81f3042aeed3e8d18ab80
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1549128
Reviewed-by: Misha Efimov <mef@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#647330}

build/config/ios/rules.gni

@@ -297,7 +297,6 @@ template("create_signed_bundle") {
     bundle_contents_dir = bundle_root_dir
     bundle_resources_dir = bundle_contents_dir
     bundle_executable_dir = bundle_contents_dir
-    bundle_plugins_dir = "$bundle_contents_dir/PlugIns"
 
     if (!defined(public_deps)) {
       public_deps = []
@@ -1757,7 +1756,7 @@ template("ios_xctest_bundle") {
         "$root_out_dir/$_output_name.xctest",
       ]
       outputs = [
-        "{{bundle_plugins_dir}}/$_output_name.xctest",
+        "{{bundle_contents_dir}}/PlugIns/$_output_name.xctest",
       ]
     }
   }

components/cronet/ios/BUILD.gn

@@ -267,7 +267,6 @@ template("ios_static_framework") {
     bundle_contents_dir = bundle_root_dir
     bundle_executable_dir = bundle_contents_dir
     bundle_resources_dir = bundle_contents_dir
-    bundle_plugins_dir = bundle_contents_dir
     deps = [
       ":$_framework_binary_target",
       ":$_framework_headers_target",

ios/chrome/app/BUILD.gn

@@ -368,7 +368,7 @@ if (current_toolchain == default_toolchain) {
         "$root_out_dir/content_widget_extension.appex",
       ]
       outputs = [
-        "{{bundle_plugins_dir}}/{{source_file_part}}",
+        "{{bundle_contents_dir}}/PlugIns/{{source_file_part}}",
       ]
     }
   }
@@ -382,7 +382,7 @@ if (current_toolchain == default_toolchain) {
         "$root_out_dir/search_widget_extension.appex",
       ]
       outputs = [
-        "{{bundle_plugins_dir}}/{{source_file_part}}",
+        "{{bundle_contents_dir}}/PlugIns/{{source_file_part}}",
       ]
     }
   }
@@ -396,7 +396,7 @@ if (current_toolchain == default_toolchain) {
         "$root_out_dir/share_extension.appex",
       ]
       outputs = [
-        "{{bundle_plugins_dir}}/{{source_file_part}}",
+        "{{bundle_contents_dir}}/PlugIns/{{source_file_part}}",
       ]
     }
   }

tools/emacs/gn.el

@@ -86,16 +86,16 @@ variable name or the '{{' and '}}' which surround it."
 (defvar gn-font-lock-var-keywords
   '("all_dependent_configs" "allow_circular_includes_from" "arflags" "args"
     "asmflags" "assert_no_deps" "bundle_deps_filter" "bundle_executable_dir"
-    "bundle_plugins_dir" "bundle_resources_dir" "bundle_root_dir" "cflags"
-    "cflags_c" "cflags_cc" "cflags_objc" "cflags_objcc" "check_includes"
-    "code_signing_args" "code_signing_outputs" "code_signing_script"
-    "code_signing_sources" "complete_static_lib" "configs" "data" "data_deps"
-    "defines" "depfile" "deps" "include_dirs" "inputs" "ldflags" "lib_dirs"
-    "libs" "output_dir" "output_extension" "output_name"
-    "output_prefix_override" "outputs" "pool" "precompiled_header"
-    "precompiled_header_type" "precompiled_source" "product_type" "public"
-    "public_configs" "public_deps" "response_file_contents" "script" "sources"
-    "testonly" "visibility" "write_runtime_deps" "bundle_contents_dir"))
+    "bundle_resources_dir" "bundle_root_dir" "cflags" "cflags_c" "cflags_cc"
+    "cflags_objc" "cflags_objcc" "check_includes" "code_signing_args"
+    "code_signing_outputs" "code_signing_script" "code_signing_sources"
+    "complete_static_lib" "configs" "data" "data_deps" "defines" "depfile"
+    "deps" "include_dirs" "inputs" "ldflags" "lib_dirs" "libs" "output_dir"
+    "output_extension" "output_name" "output_prefix_override" "outputs" "pool"
+    "precompiled_header" "precompiled_header_type" "precompiled_source"
+    "product_type" "public" "public_configs" "public_deps"
+    "response_file_contents" "script" "sources" "testonly" "visibility"
+    "write_runtime_deps" "bundle_contents_dir"))
 
 (defconst gn-font-lock-keywords
   `((,(regexp-opt gn-font-lock-reserved-keywords 'words) .