Customize CFBundleDisplayName for SxS

CFBundleDisplayName is the full name of the app (as opposed
to CFBundleName which is the "short name"). It's supposed to
match the file system name (before the user perhaps renames
it) and several utilities display it.

Make it match the full SxS app name.

Fixed: 1141844
Change-Id: I7ae6fc630c49b7d96c931238d8878d43ec3ffaf2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542158
Auto-Submit: Avi Drissman <avi@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827920}

chrome/installer/mac/signing/modification.py

@@ -12,6 +12,7 @@ import os.path
 
 from . import commands, parts
 
+_CF_BUNDLE_DISPLAY_NAME = 'CFBundleDisplayName'
 _CF_BUNDLE_EXE = 'CFBundleExecutable'
 _CF_BUNDLE_ID = 'CFBundleIdentifier'
 _CF_BUNDLE_NAME = 'CFBundleName'
@@ -47,8 +48,10 @@ def _modify_plists(paths, dist, config):
                                 config.base_config.base_bundle_id,
                                 config.base_bundle_id)
 
-            app_plist[_CF_BUNDLE_ID] = config.base_bundle_id
+            app_plist[_CF_BUNDLE_DISPLAY_NAME] = '{} {}'.format(
+                app_plist[_CF_BUNDLE_DISPLAY_NAME], dist.app_name_fragment)
             app_plist[_CF_BUNDLE_EXE] = config.app_product
+            app_plist[_CF_BUNDLE_ID] = config.base_bundle_id
             app_plist[_CF_BUNDLE_NAME] = '{} {}'.format(
                 app_plist[_CF_BUNDLE_NAME], dist.app_name_fragment)
             app_plist[_KS_PRODUCT_ID] += '.' + dist.channel

chrome/installer/mac/signing/modification_test.py

@@ -13,6 +13,7 @@ def plist_read(*args):
     bundle_id = test_config.TestConfig().base_bundle_id
     plists = {
         '/$W/App Product.app/Contents/Info.plist': {
+            'CFBundleDisplayName': 'Product',
             'CFBundleIdentifier': bundle_id,
             'CFBundleName': 'Product',
             'KSProductID': 'test.ksproduct',
@@ -95,6 +96,7 @@ class TestModification(unittest.TestCase):
         self.assertEqual(1, plistlib.writePlist.call_count)
         plistlib.writePlist.assert_called_with(
             {
+                'CFBundleDisplayName': 'Product',
                 'CFBundleIdentifier': config.base_bundle_id,
                 'CFBundleName': 'Product',
                 'KSProductID': 'test.ksproduct',
@@ -131,6 +133,7 @@ class TestModification(unittest.TestCase):
         self.assertEqual(1, plistlib.writePlist.call_count)
         plistlib.writePlist.assert_called_with(
             {
+                'CFBundleDisplayName': 'Product',
                 'CFBundleIdentifier': config.base_bundle_id,
                 'CFBundleName': 'Product',
                 'KSProductID': 'test.ksproduct',
@@ -166,6 +169,7 @@ class TestModification(unittest.TestCase):
         self.assertEqual(1, plistlib.writePlist.call_count)
         plistlib.writePlist.assert_called_with(
             {
+                'CFBundleDisplayName': 'Product',
                 'CFBundleIdentifier': config.base_bundle_id,
                 'CFBundleName': 'Product',
                 'KSProductID': 'test.ksproduct',
@@ -200,6 +204,7 @@ class TestModification(unittest.TestCase):
         self.assertEqual(1, plistlib.writePlist.call_count)
         plistlib.writePlist.assert_called_with(
             {
+                'CFBundleDisplayName': 'Product',
                 'CFBundleIdentifier': config.base_bundle_id,
                 'CFBundleName': 'Product',
                 'KSProductID': 'test.ksproduct',
@@ -238,6 +243,7 @@ class TestModification(unittest.TestCase):
         self.assertEqual(1, plistlib.writePlist.call_count)
         plistlib.writePlist.assert_called_with(
             {
+                'CFBundleDisplayName': 'Product',
                 'CFBundleIdentifier': config.base_bundle_id,
                 'CFBundleName': 'Product',
                 'KSProductID': 'test.ksproduct',
@@ -273,6 +279,7 @@ class TestModification(unittest.TestCase):
         self.assertEqual(1, plistlib.writePlist.call_count)
         plistlib.writePlist.assert_called_with(
             {
+                'CFBundleDisplayName': 'Product',
                 'CFBundleIdentifier': config.base_bundle_id,
                 'CFBundleName': 'Product',
                 'KSProductID': 'test.ksproduct',
@@ -308,6 +315,7 @@ class TestModification(unittest.TestCase):
         self.assertEqual(1, plistlib.writePlist.call_count)
         plistlib.writePlist.assert_called_with(
             {
+                'CFBundleDisplayName': 'Product',
                 'CFBundleIdentifier': config.base_bundle_id,
                 'CFBundleName': 'Product',
                 'KSProductID': 'test.ksproduct',
@@ -342,6 +350,7 @@ class TestModification(unittest.TestCase):
         self.assertEqual(1, plistlib.writePlist.call_count)
         plistlib.writePlist.assert_called_with(
             {
+                'CFBundleDisplayName': 'Product',
                 'CFBundleIdentifier': config.base_bundle_id,
                 'CFBundleName': 'Product',
                 'KSProductID': 'test.ksproduct',
@@ -425,6 +434,7 @@ class TestModification(unittest.TestCase):
             ),
             mock.call(
                 {
+                    'CFBundleDisplayName': 'Product Canary',
                     'CFBundleIdentifier': config.base_bundle_id,
                     'CFBundleExecutable': config.app_product,
                     'CFBundleName': 'Product Canary',