[Mac/GN] Fix all the //remoting Info.plist substitutions.

remoting/remoting_version.gni

Index: remoting/remoting_version.gni
diff --git a/remoting/remoting_version.gni b/remoting/remoting_version.gni
index 13e5162bfbb3e32caa54e928c68027fe572f8db8..565011b15e3fb59310e716b49203ce6435272c35 100644
--- a/remoting/remoting_version.gni
+++ b/remoting/remoting_version.gni
@@ -3,9 +3,11 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
+import("//build/util/version.gni")
+
+remoting_version_file = "//remoting/VERSION"
 
 _version_py_abspath = "//build/util/version.py"
-_remoting_version_abspath = "//remoting/VERSION"
 if (is_chrome_branded) {
   _remoting_branding_abspath = "//remoting/branding_Chrome"
 } else {
@@ -15,22 +17,42 @@ if (is_chrome_branded) {
 # Set these files as being input dependencies to the scripts, so the build will
 # be re-run if the files change.
 remoting_version_files = [
-  _remoting_version_abspath,
+  remoting_version_file,
   _remoting_branding_abspath,
 ]
 
-_remoting_version_path = rebase_path(_remoting_version_abspath, root_build_dir)
+_remoting_version_path = rebase_path(remoting_version_file, root_build_dir)
 _remoting_branding_path =
     rebase_path(_remoting_branding_abspath, root_build_dir)
 
-_branding_dictionary_template = "mac_host_bundle = \"@MAC_HOST_BUNDLE_NAME@\" " + "mac_native_messaging_bundle = \"@MAC_NATIVE_MESSAGING_HOST_BUNDLE_NAME@\" " + "mac_remote_assistance_bundle = \"@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_NAME@\" " + "prefpane_bundle_name = \"@MAC_PREFPANE_BUNDLE_NAME@\" " + "host_bundle_name = \"@MAC_HOST_BUNDLE_NAME@\" " + "host_name= \"@MAC_HOST_PACKAGE_NAME@\" " + "host_service_name = \"@DAEMON_FILE_NAME@\" " + "bundle_prefix = \"@MAC_UNINSTALLER_BUNDLE_PREFIX@\" " + "host_uninstaller_name = \"@MAC_UNINSTALLER_NAME@\""
+_template = "mac_host_bundle = \"@MAC_HOST_BUNDLE_NAME@\" "
+_template +=
+    "mac_native_messaging_bundle = \"@MAC_NATIVE_MESSAGING_HOST_BUNDLE_NAME@\" "
+_template += "mac_remote_assistance_bundle = \"@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_NAME@\" "
+_template += "prefpane_bundle_name = \"@MAC_PREFPANE_BUNDLE_NAME@\" "
+_template += "host_bundle_name = \"@MAC_HOST_BUNDLE_NAME@\" "
+_template += "host_name= \"@MAC_HOST_PACKAGE_NAME@\" "
+_template += "host_service_name = \"@DAEMON_FILE_NAME@\" "
+_template += "bundle_prefix = \"@MAC_UNINSTALLER_BUNDLE_PREFIX@\" "
+_template += "host_uninstaller_name = \"@MAC_UNINSTALLER_NAME@\" "
+_template += "version_patch = \"@REMOTING_PATCH@\" "
+
+if (is_mac) {
+  _template += "host_bundle_id = \"@MAC_HOST_BUNDLE_ID@\" "
+  _template += "native_messaging_host_bundle_id = \"@MAC_NATIVE_MESSAGING_HOST_BUNDLE_ID@\""
+  _template += "prefpane_bundle_id = \"@MAC_PREFPANE_BUNDLE_ID@\" "
+  _template += "remote_assistance_host_bundle_id = \"@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_ID@\" "
+  _template += "uninstaller_bundle_id = \"@MAC_UNINSTALLER_BUNDLE_ID@\""
+}
 
 _result = exec_script(_version_py_abspath,
                       [
                         "-f",
                         _remoting_branding_path,
+                        "-f",
+                        _remoting_version_path,
                         "-t",
-                        _branding_dictionary_template,
+                        _template,
                       ],
                       "scope",
                       remoting_version_files)
@@ -44,3 +66,15 @@ host_uninstaller_name = _result.host_uninstaller_name
 me2me_host_bundle_name = _result.mac_host_bundle
 native_messaging_host_bundle_name = _result.mac_native_messaging_bundle
 remote_assistance_host_bundle_name = _result.mac_remote_assistance_bundle
+remoting_version_patch = _result.version_patch
+remoting_version_short =
+    "$chrome_version_major.$remoting_version_patch.$chrome_version_build"
+remoting_version_full = "$remoting_version_short.$chrome_version_patch"
+
+if (is_mac) {
+  host_bundle_id = _result.host_bundle_id
+  native_messaging_host_bundle_id = _result.native_messaging_host_bundle_id
+  prefpane_bundle_id = _result.prefpane_bundle_id
+  remote_assistance_host_bundle_id = _result.remote_assistance_host_bundle_id
+  uninstaller_bundle_id = _result.uninstaller_bundle_id
+}