Test app launcher registration in test_installer rather than InstallationValidator.

chrome/test/mini_installer/variable_expander.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import base64
 import hashlib
 import os
 import string
 import win32api
 import win32com.client
@@ skipping 54 matching lines @@
             installation directory.
         * $CHROME_HTML_PROG_ID: 'ChromeHTML' (or 'ChromiumHTM').
         * $CHROME_LONG_NAME: 'Google Chrome' (or 'Chromium').
         * $CHROME_LONG_NAME_SXS: 'Google Chrome SxS' if $SUPPORTS_SXS.
         * $CHROME_SHORT_NAME: 'Chrome' (or 'Chromium').
         * $CHROME_SHORT_NAME_SXS: 'ChromeCanary' if $SUPPORTS_SXS.
         * $CHROME_UPDATE_REGISTRY_SUBKEY: the registry key, excluding the root
             key, of Chrome for Google Update.
         * $CHROME_UPDATE_REGISTRY_SUBKEY_SXS: the registry key, excluding the
             root key, of Chrome SxS for Google Update.
+        * $LAUNCHER_UPDATE_REGISTRY_SUBKEY: the registry key, excluding the root
+            key, of the app launcher for Google Update if $SUPPORTS_SXS.
         * $LOCAL_APPDATA: the unquoted path to the Local Application Data
             folder.
         * $MINI_INSTALLER: the unquoted path to the mini_installer.
         * $MINI_INSTALLER_FILE_VERSION: the file version of the mini_installer.
         * $PROGRAM_FILES: the unquoted path to the Program Files folder.
         * $SUPPORTS_SXS: a boolean indicating whether or not SxS installs
             are supported by the mini_installer under test.
         * $USER_SPECIFIC_REGISTRY_SUFFIX: the output from the function
             _GetUserSpecificRegistrySuffix().
         * $VERSION_[XP/SERVER_2003/VISTA/WIN7/WIN8/WIN8_1/WIN10]: a 2-tuple
@@ skipping 35 matching lines @@
           'CHROME_SHORT_NAME': 'Chrome',
           'CHROME_UPDATE_REGISTRY_SUBKEY': (
             'Software\\Google\\Update\\Clients\\'
             '{8A69D345-D564-463c-AFF1-A69D9E530F96}'),
           'SUPPORTS_SXS': True,
           'CHROME_DIR_SXS': 'Google\\Chrome SxS',
           'CHROME_LONG_NAME_SXS': 'Google Chrome SxS',
           'CHROME_SHORT_NAME_SXS': 'ChromeCanary',
           'CHROME_UPDATE_REGISTRY_SUBKEY_SXS': (
             'Software\\Google\\Update\\Clients\\'
-            '{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}')
+            '{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}'),
+          'LAUNCHER_UPDATE_REGISTRY_SUBKEY': (
+            'Software\\Google\\Update\\Clients\\'
+            '{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}')
       })
     elif mini_installer_product_name == 'Chromium Installer':
       self._variable_mapping.update({
           'BINARIES_UPDATE_REGISTRY_SUBKEY': 'Software\\Chromium Binaries',
           'CHROME_DIR': 'Chromium',
           'CHROME_HTML_PROG_ID': 'ChromiumHTM',
           'CHROME_LONG_NAME': 'Chromium',
           'CHROME_SHORT_NAME': 'Chromium',
           'CHROME_UPDATE_REGISTRY_SUBKEY': 'Software\\Chromium',
           'SUPPORTS_SXS': False
@@ skipping 11 matching lines @@
     variables must be escaped with $$, otherwise a KeyError or a ValueError will
     be raised.
 
     Args:
       str: A string.
 
     Returns:
       A new string created by replacing variables with their values.
     """
     return string.Template(str).substitute(self._variable_mapping)