Clean the machine before running commands in the mini_installer test framework.

chrome/test/mini_installer/uninstall_chrome.py

Index: chrome/test/mini_installer/uninstall_chrome.py
diff --git a/chrome/test/mini_installer/uninstall_chrome.py b/chrome/test/mini_installer/uninstall_chrome.py
index f501856737d1b6eee8869193cbe9d83e7013d2c4..d497e7bf3ab28989c7bf6dcf680c105b491afc7e 100644
--- a/chrome/test/mini_installer/uninstall_chrome.py
+++ b/chrome/test/mini_installer/uninstall_chrome.py
@@ -20,6 +20,12 @@ def main():
                     default=False, help='Uninstall Chrome at system level.')
   parser.add_option('--chrome-long-name', default='Google Chrome',
                     help='Google Chrome or Chromium)')
+  parser.add_option('--interactive', action='store_true', dest='interactive',
+                    default=False, help='Ask before uninstalling Chrome.')
+  parser.add_option('--no-error-if-absent', action='store_true',
+                    dest='no_error_if_absent', default=False,
+                    help='No error if the registry key for uninstalling Chrome '
+                         'is absent.')
   options, _ = parser.parse_args()
 
   # TODO(sukolsak): Add support for uninstalling MSI-based Chrome installs when
@@ -34,9 +40,18 @@ def main():
   try:
     key = _winreg.OpenKey(root_key, sub_key, 0, _winreg.KEY_QUERY_VALUE)
   except WindowsError:
+    if options.no_error_if_absent:
+      return 0
     raise KeyError('Registry key %s\\%s is missing' % (
         'HKEY_LOCAL_MACHINE' if options.system_level else 'HKEY_CURRENT_USER',
         sub_key))
+  if options.interactive:
+    prompt = ('Warning: This will uninstall %s at %s. Do you want to continue? '
+              '(y/N) ' % (options.chrome_long_name, 'system-level' if
+                          options.system_level else 'user-level'))

[gab, 2013/09/16 18:33:45]

nit: Fix ident (i.e. options.system_level is a continuation of the statement
that starts with 'system_level' above; it should thus indented 4 spaces more
than that (which doesn't fit) -- so you'll need to bring 'system_level'... down
to this line

[gab, 2013/09/16 20:04:14]

e.g.,

'(y/N) ' % (options.chrome_long_name, 
            'system-level' if
                options.system_level else 'user-level'))

[sukolsak, 2013/09/16 22:02:02]

Done.

+    if raw_input(prompt).strip() != 'y':
+      print >> sys.stderr, 'User aborted'
+      return 1
   uninstall_string, _ = _winreg.QueryValueEx(key, 'UninstallString')
   exit_status = subprocess.call(uninstall_string + ' --force-uninstall',
                                 shell=True)