[Mac/GN] Move the bundle ID and creator code into the BRANDING file, and use it.

build/util/branding.gni

Index: build/util/branding.gni
diff --git a/build/util/branding.gni b/build/util/branding.gni
index b234b817c892b4da8a5c414eb15a51c7445bcb69..c38d2a9fc72c177b5ee8e6bf05471c0758d5a757 100644
--- a/build/util/branding.gni
+++ b/build/util/branding.gni
@@ -14,15 +14,26 @@
 
 import("//build/config/chrome_build.gni")
 
+_branding_dictionary_template = "full_name = \"@PRODUCT_FULLNAME@\" " +
+                                "short_name = \"@PRODUCT_SHORTNAME@\" " +
+                                "bundle_id = \"@MAC_BUNDLE_ID@\" " +
+                                "creator_code = \"@MAC_CREATOR_CODE@\" "
+
 _branding_file = "//chrome/app/theme/$branding_path_component/BRANDING"
 _result = exec_script("version.py",
                       [
                         "-f",
                         rebase_path(_branding_file, root_build_dir),
                         "-t",
-                        "@PRODUCT_FULLNAME@",
+                        _branding_dictionary_template,
                       ],
-                      "trim string",
+                      "scope",

[Mark Mentovai, 2016/05/03 17:54:51]

This change from “trim string” to “scope” is the most confusing thing. I see
that you’re changing from a single string to a whole dicty thing, but “scope”
doesn’t tell me what it actually does, and I want to make sure that it’s right
here, and that full_name has the same semantics as it did before.

[Robert Sesek, 2016/05/03 18:02:39]

Yeah, it's a little confusing, but I mostly just copied this from
build/util/version.gni and it does this. The dicty thing is:

{
  full_name = "Chromium"
  short_name = "Chromium"
  bundle_id = "org.chromium.Chromium"
  creator_code = "Cr24"
}


(you can use |print(anything)| in gn to have it output when you `gn gen`)

                       [ _branding_file ])
 
-chrome_product_full_name = _result
+chrome_product_full_name = _result.full_name
+chrome_product_short_name = _result.short_name
+
+if (is_mac) {
+  chrome_mac_bundle_id = _result.bundle_id
+  chrome_mac_creator_code = _result.creator_code
+}