test: Clean up site_login.py a bit.

client/bin/site_ui_test.py

Index: client/bin/site_ui_test.py
diff --git a/client/bin/site_ui_test.py b/client/bin/site_ui_test.py
index cbef8bce2123debd4a246fddf5f2f796f3f05bc2..e86087763acf3c6b49eeecba2f30391c144b7a3f 100644
--- a/client/bin/site_ui_test.py
+++ b/client/bin/site_ui_test.py
@@ -23,19 +23,12 @@ class UITest(bin_test.test):
     def initialize(self, script='autox_script.json'):
         # Clean up past state and assume logged out before logging in.
         if site_login.logged_in():
-            if not site_login.attempt_logout(timeout=10):
-                raise error.TestFail('Could not logout from previous session')
-            if not site_login.wait_for_browser():
-                raise error.TestFail("Login manager did not restart")
+            site_login.attempt_logout()
 
         # Test account information embedded into json file.
-        if not site_login.attempt_login(self, script):
-            raise error.TestFail('Login failed at the beginning of new session')
+        site_login.attempt_login(self, script)
+        site_login.wait_for_initial_chrome_window()
 
-
-    """
-    Logs out when object is deleted
-    """
     def cleanup(self):
-        if not site_login.attempt_logout():
-            raise error.TestFail('Could not logout at end of session')
+        """Logs out when object is deleted"""
+        site_login.attempt_logout()