test: Clean up site_login.py a bit.

client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.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 logging, os, stat, time, utils
 from autotest_lib.client.bin import chromeos_constants, site_cryptohome
 from autotest_lib.client.bin import site_login, test
 from autotest_lib.client.common_lib import error, site_httpd, site_ui
 
 def respond_with_cookies(handler, url_args):
@@ skipping 37 matching lines @@
 
     def cleanup(self):
         self._testServer.stop()
 
 
     def run_once(self, script = 'autox_script.json', timeout = 10):
         logged_in = site_login.logged_in()
 
         if not logged_in:
             # Test account information embedded into json file.
-            if not site_login.attempt_login(self, script):
-                raise error.TestError('Could not login')
+            site_login.attempt_login(self, script)
 
         # Get Default/Cookies mtime.
         cookies_info = os.stat(chromeos_constants.LOGIN_PROFILE + '/Cookies')
         cookies_mtime = cookies_info[stat.ST_MTIME]
 
         # "crash" chrome.
+        site_login.wait_for_initial_chrome_window()
         site_login.nuke_process_by_name(chromeos_constants.BROWSER,
                                         with_prejudice = True)
         site_login.wait_for_browser()
 
         # Navigate to site that leaves cookies.
         latch = self._testServer.add_wait_url(self._wait_path)
         cookie_fetch_args = ("--user-data-dir=" +
                              chromeos_constants.USER_DATA_DIR + ' ' +
                              self._test_url)
         session = site_ui.ChromeSession(args=cookie_fetch_args,
                                         clean_state=False)
         logging.debug('Chrome session started.')
         latch.wait(timeout)
 
         # Ensure chrome writes state to disk.
         site_login.attempt_logout()
-        site_login.wait_for_browser()
-        if not site_login.attempt_login(self, script):
-            raise error.TestError('Could not log back in')
+        site_login.attempt_login(self, script)
 
         if not latch.is_set():
             raise error.TestError('Never received callback from browser.')
 
         # Check mtime of Default/Cookies.  If changed, KABLOOEY.
         self.__wait_for_login_profile()
         cookies_info = os.stat(chromeos_constants.LOGIN_PROFILE + '/Cookies')
         if cookies_mtime != cookies_info[stat.ST_MTIME]:
             raise error.TestFail('Cookies in Default profile changed!')
 
         # If we started logged out, log back out.
         if not logged_in:
             site_login.attempt_logout()