Revert of Enable side-by-side beta and dev channels.

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 189 matching lines @@
     variable_expander: A VariableExpander object.
   """
   # 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('$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:
     command = ('python uninstall_chrome.py '
                '--chrome-long-name="%s" '
                '--no-error-if-absent %s %s' %
                (product_name, product_switch, interactive_option))
     try:
       RunCommand(command, variable_expander)
     except:
@@ skipping 219 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())