| Index: chrome/test/mini_installer/test_installer.py
|
| diff --git a/chrome/test/mini_installer/test_installer.py b/chrome/test/mini_installer/test_installer.py
|
| index 21f10a9f2e4917e9020dd2839cb8c1cc9e2d340a..c0c9a91e3b7314954d49ff6a0fb09ffef640403e 100644
|
| --- a/chrome/test/mini_installer/test_installer.py
|
| +++ b/chrome/test/mini_installer/test_installer.py
|
| @@ -207,17 +207,9 @@
|
| (True, '$CHROME_LONG_NAME', '--system-level',
|
| '$CHROME_UPDATE_REGISTRY_SUBKEY'),
|
| ]
|
| - if variable_expander.Expand('$BRAND') == 'Google Chrome':
|
| - data.extend([(False, '$CHROME_LONG_NAME_BETA', '',
|
| - '$CHROME_UPDATE_REGISTRY_SUBKEY_BETA'),
|
| - (True, '$CHROME_LONG_NAME_BETA', '--system-level',
|
| - '$CHROME_UPDATE_REGISTRY_SUBKEY_BETA'),
|
| - (False, '$CHROME_LONG_NAME_DEV', '',
|
| - '$CHROME_UPDATE_REGISTRY_SUBKEY_DEV'),
|
| - (True, '$CHROME_LONG_NAME_DEV', '--system-level',
|
| - '$CHROME_UPDATE_REGISTRY_SUBKEY_DEV'),
|
| - (False, '$CHROME_LONG_NAME_SXS', '',
|
| - '$CHROME_UPDATE_REGISTRY_SUBKEY_SXS')])
|
| + if variable_expander.Expand('$SUPPORTS_SXS') == 'True':
|
| + data.append((False, '$CHROME_LONG_NAME_SXS', '',
|
| + '$CHROME_UPDATE_REGISTRY_SUBKEY_SXS'))
|
|
|
| interactive_option = '--interactive' if not force_clean else ''
|
| for system_level, product_name, product_switch, registry_subkey in data:
|
|
|