test_installer: fix RunCleanCommand for SxS installs.

chrome/test/mini_installer/test_installer.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.
 
 """This script tests the installer with test cases specified in the config file.
 
 For each test case, it checks that the machine states after the execution of
 each command match the expected machine states. For more details, take a look at
 the design documentation at http://goo.gl/Q0rGM6
 """
@@ skipping 150 matching lines @@
     variable_expander: A VariableExpander object.
   """
   expanded_command = variable_expander.Expand(command)
   script_dir = os.path.dirname(os.path.abspath(__file__))
   exit_status = subprocess.call(expanded_command, shell=True, cwd=script_dir)
   if exit_status != 0:
     raise Exception('Command %s returned non-zero exit status %s' % (
         expanded_command, exit_status))
 
 
-def DeleteGoogleUpdateRegistration(system_level, variable_expander):
+def DeleteGoogleUpdateRegistration(system_level, registry_subkey,
+                                   variable_expander):
   """Deletes Chrome's registration with Google Update.
 
   Args:
     system_level: True if system-level Chrome is to be deleted.
+    registry_subkey: The pre-expansion registry subkey for the product.
     variable_expander: A VariableExpander object.
   """
   root = (_winreg.HKEY_LOCAL_MACHINE if system_level
           else _winreg.HKEY_CURRENT_USER)
-  key_name = variable_expander.Expand('$CHROME_UPDATE_REGISTRY_SUBKEY')
+  key_name = variable_expander.Expand(registry_subkey)
   try:
     key_handle = _winreg.OpenKey(root, key_name, 0,
                                  _winreg.KEY_SET_VALUE |
                                  _winreg.KEY_WOW64_32KEY)
     _winreg.DeleteValue(key_handle, 'pv')
   except WindowsError:
     # The key isn't present, so there is no value to delete.
     pass
 
 
 def RunCleanCommand(force_clean, variable_expander):
   """Puts the machine in the clean state (i.e. Chrome not installed).
 
   Args:
     force_clean: A boolean indicating whether to force cleaning existing
         installations.
     variable_expander: A VariableExpander object.
   """
-  # TODO(sukolsak): Handle Chrome SxS installs.
+  # A list of (system_level, product_name, product_switch, registry_subkey)
+  # tuples for the possible installed products.
+  data = [
+    (False, '$CHROME_LONG_NAME', '',
+     '$CHROME_UPDATE_REGISTRY_SUBKEY'),
+    (True, '$CHROME_LONG_NAME', '--system-level',
+     '$CHROME_UPDATE_REGISTRY_SUBKEY'),
+  ]
+  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 in (False, True):
-    level_option = '--system-level' if system_level else ''
+  for system_level, product_name, product_switch, registry_subkey in data:
     command = ('python uninstall_chrome.py '
-               '--chrome-long-name="$CHROME_LONG_NAME" '
+               '--chrome-long-name="%s" '
                '--no-error-if-absent %s %s' %
-               (level_option, interactive_option))
+               (product_name, product_switch, interactive_option))
     RunCommand(command, variable_expander)
     if force_clean:
-      DeleteGoogleUpdateRegistration(system_level, variable_expander)
+      DeleteGoogleUpdateRegistration(system_level, registry_subkey,
+                                     variable_expander)
 
 
 def MergePropertyDictionaries(current_property, new_property):
   """Merges the new property dictionary into the current property dictionary.
 
   This is different from general dictionary merging in that, in case there are
   keys with the same name, we merge values together in the first level, and we
   override earlier values in the second level. For more details, take a look at
   http://goo.gl/uE0RoR
 
@@ skipping 200 matching lines @@
     trie[path] = value
     return
   directory, rest = path.split(TEST_SEPARATOR, 1)
   if directory not in trie:
     trie[directory] = {}
   _AddPathToTrie(trie[directory], rest, value)
 
 
 if __name__ == '__main__':
   sys.exit(main())