Commit 34c4d91d authored by S. Ganesh's avatar S. Ganesh Committed by Commit Bot

Fix variable_expander.py to match new Elevation Service Display Name.

The display name changes from the format
"Google Chrome Elevation Service"
to
"Google Chrome Elevation Service (GoogleChromeElevationService)".

Bug: 1059459
Change-Id: I3505a1c2fea6deee66e7d2395a7e9594e76dc95a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2092671
Commit-Queue: Greg Thompson <grt@chromium.org>
Reviewed-by: default avatarGreg Thompson <grt@chromium.org>
Auto-Submit: S. Ganesh <ganesh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748128}
parent e2468717
...@@ -256,13 +256,16 @@ class VariableExpander: ...@@ -256,13 +256,16 @@ class VariableExpander:
'CHROME_ELEVATION_SERVICE_NAME_SXS': ( 'CHROME_ELEVATION_SERVICE_NAME_SXS': (
'GoogleChromeCanaryElevationService'), 'GoogleChromeCanaryElevationService'),
'CHROME_ELEVATION_SERVICE_DISPLAY_NAME': ( 'CHROME_ELEVATION_SERVICE_DISPLAY_NAME': (
'Google Chrome Elevation Service'), 'Google Chrome Elevation Service (GoogleChromeElevationService)'),
'CHROME_ELEVATION_SERVICE_DISPLAY_NAME_BETA': ( 'CHROME_ELEVATION_SERVICE_DISPLAY_NAME_BETA': (
'Google Chrome Beta Elevation Service'), 'Google Chrome Beta Elevation Service'
' (GoogleChromeBetaElevationService)'),
'CHROME_ELEVATION_SERVICE_DISPLAY_NAME_DEV': ( 'CHROME_ELEVATION_SERVICE_DISPLAY_NAME_DEV': (
'Google Chrome Dev Elevation Service'), 'Google Chrome Dev Elevation Service'
' (GoogleChromeDevElevationService)'),
'CHROME_ELEVATION_SERVICE_DISPLAY_NAME_SXS': ( 'CHROME_ELEVATION_SERVICE_DISPLAY_NAME_SXS': (
'Google Chrome Canary Elevation Service'), 'Google Chrome Canary Elevation Service'
' (GoogleChromeCanaryElevationService)'),
}) })
elif mini_installer_product_name == 'Chromium Installer': elif mini_installer_product_name == 'Chromium Installer':
self._variable_mapping.update({ self._variable_mapping.update({
...@@ -280,7 +283,7 @@ class VariableExpander: ...@@ -280,7 +283,7 @@ class VariableExpander:
'CHROME_ELEVATOR_IID': ('{B88C45B9-8825-4629-B83E-77CC67D9CEED}'), 'CHROME_ELEVATOR_IID': ('{B88C45B9-8825-4629-B83E-77CC67D9CEED}'),
'CHROME_ELEVATION_SERVICE_NAME': 'ChromiumElevationService', 'CHROME_ELEVATION_SERVICE_NAME': 'ChromiumElevationService',
'CHROME_ELEVATION_SERVICE_DISPLAY_NAME': ( 'CHROME_ELEVATION_SERVICE_DISPLAY_NAME': (
'Chromium Elevation Service'), 'Chromium Elevation Service (ChromiumElevationService)'),
}) })
else: else:
raise KeyError("Unknown mini_installer product name '%s'" % raise KeyError("Unknown mini_installer product name '%s'" %
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment