[autotest] remove ownership state, THEN restart the browser

client/bin/site_ui_test.py

 # Copyright (c) 2010 The Chromium OS 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 dbus, logging, os, shutil, socket, sys, time
 from autotest_lib.client.bin import chromeos_constants, site_cryptohome
 from autotest_lib.client.bin import site_login, site_utils, test as bin_test
 from autotest_lib.client.common_lib import error, site_ui
 from autotest_lib.client.common_lib import site_auth_server, site_dns_server
 from dbus.mainloop.glib import DBusGMainLoop
@@ skipping 73 matching lines @@
                 if servers != None:
                     self._dns[path] = ','.join(servers)
                     logging.debug("Cached DNS for "  + properties['Type'])
                 ipconfig.SetProperty('NameServers', '127.0.0.1')
                 logging.debug("Changed DNS for "  + properties['Type'])
 
         site_utils.poll_for_condition(
             lambda: self.__attempt_resolve('www.google.com', '127.0.0.1'),
             site_login.TimeoutError('Timed out waiting for DNS changes.'),
             10)
-        site_login.refresh_login_screen()
 
 
     def revert_dns(self):
         """Clear the custom DNS setting for all devices and force them to use
         DHCP to pull the network's real settings again.
         """
         for device in self._flim.GetObjectList('Device'):
             properties = device.GetProperties()
             logging.debug("Considering " + properties['Type'])
             for path in properties['IPConfigs']:
@@ skipping 59 matching lines @@
         try:
             site_cryptohome.remove_vault(self.username)
         except site_cryptohome.ChromiumOSError, error:
             logging.error(error)
         # Ensure there's no stale owner state from previous tests.
         try:
             os.unlink(chromeos_constants.OWNER_KEY_FILE)
             os.unlink(chromeos_constants.SIGNED_PREFERENCES_FILE)
         except (IOError, OSError) as error:
             logging.info(error)
+        site_login.refresh_login_screen()
 
         if self.auto_login:
             self.login(self.username, self.password)
 
 
     def __canonicalize(self, credential):
         """Perform basic canonicalization of |email_address|
 
         Perform basic canonicalization of |email_address|, taking
         into account that gmail does not consider '.' or caps inside a
@@ skipping 115 matching lines @@
                 logging.error(error)
 
         self.stop_authserver()
 
 
     def get_auth_endpoint_misses(self):
         if hasattr(self, '_authServer'):
             return self._authServer.get_endpoint_misses()
         else:
             return {}